Minor changes to allow timing tests