More setup script fixes.