codereview fixes for 4144077