Squashed some Bugs.