Regression fix and fix for download timeouts