More fixes to serial.cpp