Fix for keep alive and time zone issue