Fix some of the @wip-new-core wire protocol scenarios