Improved multi-arch support for Linux and Windows