Fix use of Singleton
And some Singleton fixes.