couple of crashes fixed