Updated some ZF2 bits