Fix service initialization