Fixes for email subscriptions