Fixup crashes