Fixed some timing things