Adjustments to allow execution time measurement