Squash a few more bugs