some more compilation fixes