Squashed a couple of bugs.