more 1.8.7 vs 1.9.x differences fixed