Resolved timezone issues