fix 1.8 issues