Fix service resources so they correctly check status