Small bugfixes for live systems, only tested on virtual machines before.
Merge branch 'master' of github.com:Torxed/Scripts