small fixes in zpc