Little fixes with timing