My workaround is to use distance between fills, and forget about the odometer, so I can easily enter any distance my math gives.
In my case, my bike Teresa is a bit too modest - I've checked with road signs and google maps, and she's definitely off. Plus I often roll down our hill without turning the key so that distance isn't covered. And sometimes even the odo/tripmeter steps back to the last 'checkpoint' when it occassionally resets on a start. Therefore I have to correct every distance I get.
OTOH, I bought a car two weeks ago (no data entered yet) and I found that its odo/tripmeter is off again, compared to our bikes (Teresa is on the modest side, while our other bike, Ciliegia looks pretty much spot on), it counts more than the bikes. After a bit of research I learned that the equipped tires have 3% less diameter than the factory default - so I'll have to correct the distance again.
All in all, I won't ever use odometer data for anything other than timing maintenance.