A couple of bugs from the last commit.