Fixup from code review comments