Some fix with new server unsync