diff --git a/main.go b/main.go
index 3393ec0..56d3cd5 100644
--- a/main.go
+++ b/main.go
@@ -585,7 +585,7 @@ func handleBotControlMessages(s *discordgo.Session, m *discordgo.MessageCreate,
 	}
 }
 
-func setIdleStatus(s *discordgo.Session) {
+func setIdleStatus() {
 	games := []string{
 		"Terranigma",
 		"Secret of Mana",
@@ -625,8 +625,8 @@ func setIdleStatus(s *discordgo.Session) {
 		"R-Type",
 	}
 	for {
-		s.UpdateStreamingStatus(1, "", "")
-		s.UpdateStatus(0, games[randomRange(0, len(games))])
+		discord.UpdateStreamingStatus(1, "", "")
+		discord.UpdateStatus(0, games[randomRange(0, len(games))])
 		time.Sleep(time.Duration(randomRange(5, 15)) * time.Minute)
 	}
 }
@@ -785,7 +785,7 @@ func main() {
 		return
 	}
 
-	go setIdleStatus(discord)
+	go setIdleStatus()
 	// We're running!
 	log.Info("Gidbig is ready. Quit with CTRL-C.")
 
diff --git a/webserver.go b/webserver.go
index 46a7282..085926e 100644
--- a/webserver.go
+++ b/webserver.go
@@ -128,5 +128,7 @@ func handlediscordCallback(w http.ResponseWriter, r *http.Request) {
 	session.Values["accessToken"] = token.AccessToken
 	session.Save(r, w)
 
+	dg.Close()
+
 	http.Redirect(w, r, "/", http.StatusTemporaryRedirect)
 }