Fixing bugs in setup server scripts