Fixes to subscriber