diff --git a/app/logical/pixiv_api_client.rb b/app/logical/pixiv_api_client.rb
index 7c9e50a73..bb8d572c7 100644
--- a/app/logical/pixiv_api_client.rb
+++ b/app/logical/pixiv_api_client.rb
@@ -1,3 +1,5 @@
+require 'resolv-replace'
+
 class PixivApiClient
   API_VERSION = "1"
   CLIENT_ID = "bYGKuGVw91e0NMfPGp44euvGt59s"
@@ -171,7 +173,7 @@ class PixivApiClient
       }
       url = "https://oauth.secure.pixiv.net/auth/token"
 
-      resp = HTTParty.post(url, Danbooru.config.httparty_options.deep_merge(body: params, headers: headers))
+      resp = HTTParty.post(url, Danbooru.config.httparty_options.deep_merge(timeout: 20, body: params, headers: headers))
       body = resp.body.force_encoding("utf-8")
 
       if resp.success?
diff --git a/config/initializers/mechanize_patch.rb b/config/initializers/mechanize_patch.rb
index 027db5fc4..a8b830610 100644
--- a/config/initializers/mechanize_patch.rb
+++ b/config/initializers/mechanize_patch.rb
@@ -42,12 +42,14 @@ if Rails.env.test?
 
         # Pass on the error if we've tried too many times.
         if retry_count >= MAX_RESET_RETRIES
-          puts "**** WARN: Mechanize retried connection reset #{MAX_RESET_RETRIES} times and never succeeded: #{action}"
+          print "R"
+          #puts "**** WARN: Mechanize retried connection reset #{MAX_RESET_RETRIES} times and never succeeded: #{action}"
           raise
         end
 
         # Otherwise, shutdown the persistent HTTP connection and try again.
-        puts "**** WARN: Mechanize retrying connection reset error: #{action}"
+        print "R"
+        #puts "**** WARN: Mechanize retrying connection reset error: #{action}"
         retry_count += 1
         self.http.shutdown
         retry