Fixes in permission/contenttypes clashes