Some serial bugfixes