[fix] missing modifications to move to server