tweaks to get working with latest version of Django-CMS