Changes from code reviews