Found a couple of bugs.