Some fixes to channelId handling and path switching