More compilation fixes.