Service fixes