codereview fixes for da223d8