More fixes in code reviews