Small optimizations to install script