Improvements to logging and subscription management