A bit of cleanup and crash fixes