Fixes for OTP R16B. Makes YXA non-compliant to older versions!