Fixup: code review comments