Fixup: code review comments and stuff