Minor changes used to time mock making