Squashed more bugs