Some For X-Framework compatibles changes