A few crashing bugs

A few crashing bugs