A few more compilation fixes.