[SerialICE] Patch merged into serialice/master: 072f1bb SerialICE: Minor cleanups