Squashed a couple of bugs for release