More comms bug fixes