Squashed some more bugs