Fixing problems found in code review