Additional changes to match install script