codereview fixes for 8f8458c