Bugfixes to ContentManagement