Minor fixes on server-setup.sh