fixes for PUCode singletons