Updated to work with current installation script.