Some (most singleton/logging) fixes