Squashed some bugs.