Squash a few bugs