Little changes to match the server bugfixes