Fix several crashes related to singleton init (now uses Init-on-demand holder idiom)