Small fixes

I couldn't find how to merge commits into one single commit, probably because I'm using the web interface.

Some of them changes code inside some scripts, so please check whether I messed up anything