fixup crashes