more compilation fixes