Fixes on server-setup-sh