some quick fixes for Serial