Fixes for the installation script (still doesn't work)