1.8 issues fixes

[ #1_8_7 ]