3 files changed, 7 insertions, 5 deletions
diff --git a/src/wasm-ast.c b/src/wasm-ast.c
index 13d41435..54282f2d 100644
--- a/src/wasm-ast.c
+++ b/src/wasm-ast.c
@@ -167,7 +167,7 @@ static int find_binding_index_by_name(const WasmBindingHash* hash,
 int wasm_get_index_from_var(const WasmBindingHash* hash, const WasmVar* var) {
   if (var->type == WASM_VAR_TYPE_NAME)
     return find_binding_index_by_name(hash, &var->name);
-  return var->index;
+  return (int)var->index;
 }
 
 WasmExportPtr wasm_get_export_by_name(const WasmModule* module,
@@ -193,7 +193,7 @@ int wasm_get_import_index_by_var(const WasmModule* module, const WasmVar* var) {
 
 int wasm_get_local_index_by_var(const WasmFunc* func, const WasmVar* var) {
   if (var->type == WASM_VAR_TYPE_INDEX)
-    return var->index;
+    return (int)var->index;
 
   int result = find_binding_index_by_name(&func->param_bindings, &var->name);
   if (result != -1)
diff --git a/src/wasm-binary-reader-ast.c b/src/wasm-binary-reader-ast.c
index 50513774..a3dc6d37 100644
--- a/src/wasm-binary-reader-ast.c
+++ b/src/wasm-binary-reader-ast.c
@@ -662,7 +662,7 @@ static WasmResult on_call_expr(uint32_t arity,
   LOGF("%" PRIzd ": call:%d %d\n", ctx->expr_stack_size, arity, func_index);
   assert(func_index < ctx->module->funcs.size);
   WasmFunc* func = ctx->module->funcs.data[func_index];
-  uint32_t sig_index = func->decl.type_var.index;
+  uint32_t sig_index = (uint32_t)func->decl.type_var.index;
   assert(sig_index < ctx->module->func_types.size);
   WasmFuncType* func_type = ctx->module->func_types.data[sig_index];
 
@@ -684,7 +684,7 @@ static WasmResult on_call_import_expr(uint32_t arity,
        import_index);
   assert(import_index < ctx->module->imports.size);
   WasmImport* import = ctx->module->imports.data[import_index];
-  uint32_t sig_index = import->decl.type_var.index;
+  uint32_t sig_index = (uint32_t)import->decl.type_var.index;
   assert(sig_index < ctx->module->func_types.size);
   WasmFuncType* func_type = ctx->module->func_types.data[sig_index];
 
diff --git a/src/wasm-binary-reader.c b/src/wasm-binary-reader.c
index 3d1cd6c0..06942f12 100644
--- a/src/wasm-binary-reader.c
+++ b/src/wasm-binary-reader.c
@@ -416,7 +416,9 @@ static void logging_on_error(uint32_t offset,
                              const char* message,
                              void* user_data) {
   LoggingContext* ctx = user_data;
-  FORWARD(on_error, offset, message);
+  if (ctx->reader->on_error) {
+    ctx->reader->on_error(offset, message, ctx->reader->user_data);
+  }
 }
 
 static WasmResult logging_begin_module(void* user_data) {