Fixed some fundamental service-related stuff.