Squished some bugs