Squashed more bugs :-)