setup script fixes