Subscribe Fixes

Small tweaks