Revise subpar code of injection providers (breaks build)