Review fixes continued.