Small performance improvements to cut STEP start up time by 1/2