Fixes for ZF5