Two small llvmcall fixes imported from cxx branch