Fix some serial comms stuff