x86 function call and return fixes.