Fixed warnings, made service use injector