Further fixes/cleanups in main Singleton classes.