Tweaking cms.compat