minor fixes 1.8