Subscriber improvements and config tweaks