Initial fixes for Singleton module