Fixes for Keep-Alive connections