Cleanup some problems with the first commit.