Compilation fixes.