Fix redline issue, fix rawxyz