Various bugfixes for new cms setup