squashing some bugs