The second, related problem is that the value of a unit of time is partially determined by the duration of the total period in which that unit falls.
Fixing the first problem automatically resolves the second one.