Fix timezone issues once and for all