Squished a couple of bugs