Updates to fix timezone issues