Minor setup script fixes