(fix): a few issues in subscriptions/incoming