Fixed client timeout and lag issues