subscription block fixes