Slight TCP request handling improvements