[TASK] Service-related fault preventions and improvements