codereview fixes for 8151151