codereview fixes for e5383ed