Partil fixup of master