Add channels that were already available when we detected wreqr
Small tweaks to get marionette wires working