I have to fix the two nits, so the pull request is not ready yet.