More Linux compilation fixes