diff --git a/app/controllers/app.go b/app/controllers/app.go
index 17f6165..a98effb 100644
--- a/app/controllers/app.go
+++ b/app/controllers/app.go
@@ -70,7 +70,7 @@ func (c Application) SwitchToDesktop() r.Result {
 	// Add desktop mode cookie
 	c.Session["desktopmode"] = "1"
 
-	referer, err := url.Parse(c.Request.Request.Header.Get("Referer"))
+	referer, err := url.Parse(c.Request.Header.Get("Referer"))
 	if err != nil || referer.String() == "" {
 		return c.Redirect(routes.Application.Index())
 	}
@@ -82,7 +82,7 @@ func (c Application) SwitchToMobile() r.Result {
 	// Remove desktop mode cookie
 	delete(c.Session, "desktopmode")
 
-	referer, err := url.Parse(c.Request.Request.Header.Get("Referer"))
+	referer, err := url.Parse(c.Request.Header.Get("Referer"))
 	if err != nil || referer.String() == "" {
 		return c.Redirect(routes.Application.Index())
 	}
diff --git a/vendor/github.com/revel/modules/jobs/app/controllers/status.go b/vendor/github.com/revel/modules/jobs/app/controllers/status.go
index 5761329..c339ae2 100644
--- a/vendor/github.com/revel/modules/jobs/app/controllers/status.go
+++ b/vendor/github.com/revel/modules/jobs/app/controllers/status.go
@@ -15,8 +15,8 @@ type Jobs struct {
 func (c Jobs) Status() revel.Result {
 	remoteAddress := c.Request.RemoteAddr
 	if revel.Config.BoolDefault("jobs.acceptproxyaddress", false) {
-		if proxiedAddress, isProxied := c.Request.Header["X-Forwarded-For"]; isProxied {
-			remoteAddress = proxiedAddress[0]
+		if proxiedAddress := c.Request.Header.Get("X-Forwarded-For"); proxiedAddress != "" {
+			remoteAddress = proxiedAddress
 		}
 	}
 	if !strings.HasPrefix(remoteAddress, "127.0.0.1") &&