Fixed a couple issues with timezones