Fix manual timezone handling