Simplifications and small improvements of install-sot