Minor mods to work with ZP & GP.