Fix some bug, test in B6.