some bug-fixes for zpc :)