fix a couple things for singletons