Some corrections to work in current Zikula dev