Fix some service stuff