server-install: Add minor fixes