Fixed some minor subscription issues