* more compilation fixes