Multiple changes to address timezone issues