Fixed multi-arch build