Fix odometer and amount bugs