Fixing code review problems