further crash testing fixes.