Fixed building servers (again)