Fixes following a Code Review.