More Linux build fixes