Squashed a couple more bugs