Work and fixes on doInstall