Fixed some timer bugs