Fix timezone handling