Fixes for Zikula 1.4.x

Zikula 1.3.x is not affected