Fix initialization for singletons - error created during refactor.