Hotfixes for the server part