More potential fixes for the timezone issues