Further yasm fixes