Squashed some bugs