Fixed make_wrap and make_proc