Fixed some problems in Odometer.