Some adoptions to run with latest djangocms