Fixed services issues