diff --git a/nginx/sharelatex.conf b/nginx/sharelatex.conf
index eec4bb0938..8123e65bcd 100644
--- a/nginx/sharelatex.conf
+++ b/nginx/sharelatex.conf
@@ -11,8 +11,8 @@ server {
 		proxy_set_header Connection "upgrade";
 		proxy_set_header X-Forwarded-Host $host;
 		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_read_timeout 4m;
-		proxy_send_timeout 4m;
+		proxy_read_timeout 10m;
+		proxy_send_timeout 10m;
 	}
 
 	location /socket.io {
@@ -23,8 +23,8 @@ server {
 		proxy_set_header X-Forwarded-Host $host;
 		proxy_set_header X-Forwarded-Proto $scheme;
 		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_read_timeout 4m;
-		proxy_send_timeout 4m;
+		proxy_read_timeout 10m;
+		proxy_send_timeout 10m;
 	}
 
 	location /stylesheets {
diff --git a/settings.coffee b/settings.coffee
index 6d44c9d4b1..2bb812f6b2 100644
--- a/settings.coffee
+++ b/settings.coffee
@@ -213,7 +213,7 @@ settings =
 		collaborators: -1
 		dropbox: true
 		versioning: true
-		compileTimeout: process.env["COMPILE_TIMEOUT"] or 180
+		compileTimeout: parseInt(process.env["COMPILE_TIMEOUT"]) or 180
 		compileGroup: "standard"
 		trackChanges: true
 		templates: true