Fixed some problems with new ZF2