some serial helpful fixes/cleanups