prop: Fix so we can build with PROP_DEBUG again
STPP: Fix some bugs related to unsubscribing