General: Now more robust when using max download/upload rates