Minor changes in the duplex impl