Fix bugs in 1.6