Server fixes (2)