Squashes some bugs