codereview fixes for 674e517