Fixed some bugs with the new time scale stuff.