abi detection fixes