fixes for 1.8