Fixed all issues with keep-alive