Some more compilation fixes.