More Linux compilation fixes (again).