Improve multiarch detection