Fix more 1.6 issues