Fix bugs shown in retrack Xanza