Server partial + fix