codereview fixes for cc716ba