fix some crashes on Pismo