Better handling of mixed 64 bits/32 bits environment building.