Squashed some more bugs.