Fix some small issue for 6-2