Some compilation fixes.