Fix and add output for timing calls