Fixup: code review