Fixes

Should properly work after this PR https://github.com/zendframework/zf2/pull/5502