yet more fixes to zpp