Subscribe fixes