diff --git a/README.md b/README.md
index 736d0612..1f39cc1a 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ PULPino has the following requirements
   ETH. The ETH versions supports all the ISA extensions that were incorporated
   into the RI5CY core as well as the reduced base instruction set for zero-riscy.
   Please make sure you are using the newlib version of the toolchain.
-- python2 >= 2.6
+- python2 >= 2.6 (and PyYAML)
 - verilator 3.884 only necessary if you want to use Verilator to evaluate PULPino.
 
 ## ISA Support
@@ -86,7 +86,7 @@ It is written in LaTeX and there is no pdf included in the repository. Simply ty
 
     make all
 
-inside the folder to generate the pdf. Note that you need a working version of latex for this step.
+inside the folder to generate the pdf. Note that you need a working version of latex and tgif for this step.
 
 
 ## Running simulations
@@ -96,7 +96,7 @@ Create a build folder somewhere, e.g. in the sw folder
 
     mkdir build
 
-Copy the cmake-configure.{*}.gcc.sh bash script to the build folder.
+Copy the cmake_configure.{*}.gcc.sh bash script to the build folder.
 This script can be found in the sw subfolder of the git repository.
 
 Modify the cmake-configure script to your needs and execute it inside the build folder.
diff --git a/create-archive.py b/create-archive.py
index 342dd659..7a6526a0 100755
--- a/create-archive.py
+++ b/create-archive.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys,os,subprocess,re
 from time import strftime
diff --git a/generate-scripts.py b/generate-scripts.py
index 146bcae8..bafdab45 100755
--- a/generate-scripts.py
+++ b/generate-scripts.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Francesco Conti <f.conti@unibo.it>
 #
 # Copyright (C) 2016 ETH Zurich, University of Bologna.
diff --git a/update-ips.py b/update-ips.py
index 57b33e2e..b6543290 100755
--- a/update-ips.py
+++ b/update-ips.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # Francesco Conti <f.conti@unibo.it>
 #
 # Copyright (C) 2016 ETH Zurich, University of Bologna.
@@ -23,9 +23,13 @@ def execute_out(cmd, silent=False):
 def find_server():
     stdout = execute_out("git remote -v")
 
+    remote_name = "origin"
+    if "upstream" in stdout:
+        remote_name = "upstream"
+
     stdout = stdout.split('\n')
     for line in stdout:
-        if "origin" in line:
+        if remote_name in line:
             tmp = line.split(' ')
             tmp = tmp[0].split('\t')