pass Debug value down to internal_subcsription, small cleanup