Some more crash fixes, can't have enough rescues!