Minor changes to SingletonChan