Fix a couple of bugs regarding new subscriptions controllers