subscription fixes