codereview fixes for be50426