Fix service registration