Fix stuff for new server version