Minor compilation fixes.