Still needs fixing, but sanity checking this is the issue with some subscription tests. The flags change is a bit more invovled, not sure whether to switch to Message passing, or add Flags usages in some cases.