Updates due to updating to mruby trunk