More Linux build fixes.