A few install script cleanups