Fixes timezone issues