Singleton creation fix + refinements