codereview fixes for f8436980d27b07f0a532906641a05a71b125e505