Review fixes #2.