More bugfixes on the server-side.