Fixed problems which can occurr over a very fast link. This was fixed in 2.1.3 but didn't make it back into the regular branch.