Fix minor issues

main.go

@@ -71,16 +71,14 @@ func main() {
 			fmt.Println("=== END STACK ===")
 		}
 
-		go func() {
-			modules.Shutdown()
-			os.Exit(0)
-		}()
 		go func() {
 			time.Sleep(3 * time.Second)
 			fmt.Println("===== TAKING TOO LONG FOR SHUTDOWN - PRINTING STACK TRACES =====")
 			pprof.Lookup("goroutine").WriteTo(os.Stdout, 2)
 			os.Exit(1)
 		}()
+		modules.Shutdown()
+		os.Exit(0)
 
 	case <-modules.ShuttingDown():
 	}