codereview fixes for 739fb7d