Fixes in server.js