Fix some timer issues