Fix for spaces in install directory and in env names