Fixes & ffcms 2.0.4 support