Squashed some bugs!