Updates to latest changes in XO-Server.