Some cleanups for Serial