Fixed some timezone problems