Properly handle non-UTC timestamps