Fixed some timer issues