Fix install script commits

It seems that only 2 first commits made it into the first pull request. I'm adding the rest of them.