More fixes to Singleton classes and their initialization process.