Squashed some bugs. Yuck!