Misc update to StopWatch