Fixup issues in response to Code Review