Code Review fixes