Fixing some DI methods after checking with new analyzer