Some improvements to ZF 2.3