[2.2] Small fixes to server