Fixes for django CMS 2.4