Fixes for latest feincms.