Fixes for HTTP timeout and stupid DNS errors