3 files changed, 22 insertions, 2 deletions
diff --git a/src/class.c b/src/class.c
index ec9c648e5..f97cc4c40 100644
--- a/src/class.c
+++ b/src/class.c
@@ -929,6 +929,13 @@ mrb_block_given_p(mrb_state *mrb)
 MRB_API mrb_int
 mrb_get_args(mrb_state *mrb, const char *format, ...)
 {
+#define ADJUST_STACK() do { \
+  if (argv_on_stack) { \
+    ci = mrb->c->ci; \
+    argv = mrb->c->ci->stack + 1; \
+  } \
+} while (0)
+
   const char *fmt = format;
   char c;
   int i = 0;
@@ -1191,6 +1198,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
         p = va_arg(ap, mrb_float*);
         if (pickarg) {
           *p = mrb_as_float(mrb, *pickarg);
+          ADJUST_STACK();
         }
       }
       break;
@@ -1202,6 +1210,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
         p = va_arg(ap, mrb_int*);
         if (pickarg) {
           *p = mrb_as_int(mrb, *pickarg);
+          ADJUST_STACK();
         }
       }
       break;
@@ -1364,6 +1373,8 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
 finish:
   va_end(ap);
   return i;
+
+#undef ADJUST_STACK
 }
 
 static struct RClass*
diff --git a/src/object.c b/src/object.c
index 8a2addc20..21376d08c 100644
--- a/src/object.c
+++ b/src/object.c
@@ -499,6 +499,9 @@ mrb_ensure_int_type(mrb_state *mrb, mrb_value val)
 }
 
 #ifndef MRB_NO_FLOAT
+mrb_value mrb_complex_to_f(mrb_state *mrb, mrb_value comp); // provided by mruby-complex with MRB_USE_COMPLEX
+mrb_value mrb_rational_to_f(mrb_state *mrb, mrb_value rat); // provided by mruby-rational with MRB_USE_RATIONAL
+
 MRB_API mrb_value
 mrb_ensure_float_type(mrb_state *mrb, mrb_value val)
 {
@@ -512,9 +515,15 @@ mrb_ensure_float_type(mrb_state *mrb, mrb_value val)
     case MRB_TT_FLOAT:
       return val;
 
+#ifdef MRB_USE_RATIONAL
     case MRB_TT_RATIONAL:
+      return mrb_rational_to_f(mrb, val);
+#endif
+
+#ifdef MRB_USE_COMPLEX
     case MRB_TT_COMPLEX:
-      return mrb_type_convert(mrb, val, MRB_TT_FLOAT, MRB_SYM(to_f));
+      return mrb_complex_to_f(mrb, val);
+#endif
 
     default:
       mrb_raisef(mrb, E_TYPE_ERROR, "%Y cannot be converted to Float", val);
diff --git a/src/proc.c b/src/proc.c
index 01a69fbf1..abace39de 100644
--- a/src/proc.c
+++ b/src/proc.c
@@ -67,10 +67,10 @@ mrb_proc_new(mrb_state *mrb, const mrb_irep *irep)
     p->upper = ci->proc;
     p->e.target_class = tc;
   }
-  p->body.irep = irep;
   if (irep) {
     mrb_irep_incref(mrb, (mrb_irep*)irep);
   }
+  p->body.irep = irep;
 
   return p;
 }