Generator rebuild and install script hotfixes