subscription fixes and connection establishing changes