Controlcenter bugfixes