Fix some Singletons