fix 1.6 related issues