codereview fixes for b40e8dd