Fixes to subscription stuff.