Remove hard-coded serviceId
Fix server.sh on MacOS 1.8