Edits towards zend compatibility