Review comment fixups