more compilation fixes for 1.7.2