fix some subscription issues