Fix code reviews