Fix for intermittent timing bug. 
Fix for intermittent load bug.