Fix timezone handling consistency