codereview fixes for 56dd423