ZF 2.1 compatibility fixes