Fix some bugs in 06