Incorporate serial output bug fixes