More potential SMF crash fixes.