Minor code reviews