Can we be more specific about what we are fixing? If this fix needs to be deferred, we should consider adding `TODO` in this comment so we can later find them by `rake notes` or `rake notes:todo` (there are ~80 occurrences of `TODO` in the codebase).