Setup script fixes.