Fix for service management