Fixed some funky time zone issues