Fix conversion of abi to arch