codereview fixes for fc20cd3