further adaptations to zf2