diff --git a/drivers/amalgamate/src/main.c b/drivers/amalgamate/src/main.c
index 5914a5f..e4930ea 100644
--- a/drivers/amalgamate/src/main.c
+++ b/drivers/amalgamate/src/main.c
@@ -256,7 +256,7 @@ void generate(
     project_obj->error = true;
 }
 
-UT_EXPORT 
+BAKE_AMALGAMATE_EXPORT 
 int bakemain(bake_driver_api *driver) {
     driver->generate(generate);
     return 0;
diff --git a/drivers/lang/c/src/msvc/driver.c b/drivers/lang/c/src/msvc/driver.c
index 2c50a4d..d2669e8 100755
--- a/drivers/lang/c/src/msvc/driver.c
+++ b/drivers/lang/c/src/msvc/driver.c
@@ -61,7 +61,7 @@ void add_flags(
             ut_iter it = ut_ll_iter(flags_attr->is.array);
             while (ut_iter_hasNext(&it)) {
                 bake_attr *attr = ut_iter_next(&it);
-                ut_strbuf_append(&cmd, " %s", attr->is.string);
+                ut_strbuf_append(cmd, " %s", attr->is.string);
             }
         }
     } else {
@@ -71,7 +71,7 @@ void add_flags(
             ut_iter it = ut_ll_iter(flags_attr->is.array);
             while (ut_iter_hasNext(&it)) {
                 bake_attr *attr = ut_iter_next(&it);
-                ut_strbuf_append(&cmd, " %s", attr->is.string);
+                ut_strbuf_append(cmd, " %s", attr->is.string);
             }
         }
     }
@@ -87,18 +87,18 @@ void add_flags(
     } 
 
     /* Give project access to its own id */
-    ut_strbuf_append(&cmd, " /DBAKE_PROJECT_ID=\\\"%s\\\"", project->id);
+    ut_strbuf_append(cmd, " /DBAKE_PROJECT_ID=\\\"%s\\\"", project->id);
 
     /* This macro is only set for source files of this project, and can be used
      * to exclude header statements for dependencies */
     char *building_macro = ut_asprintf(" /D%s_EXPORTS", project->id_underscore);
-    ut_strbuf_appendstr(&cmd, building_macro);
+    ut_strbuf_appendstr(cmd, building_macro);
     free(building_macro);
 
     /* Enable debugging code */
     if (!config->debug) {
-        ut_strbuf_appendstr(&cmd, " /DNDEBUG");
-        ut_strbuf_appendstr(&cmd, " /DEBUG:FULL");
+        ut_strbuf_appendstr(cmd, " /DNDEBUG");
+        ut_strbuf_appendstr(cmd, " /DEBUG:FULL");
     }     
 }
 
@@ -142,7 +142,7 @@ void compile_src(
         ut_strbuf_appendstr(&cmd, " /WX");
     }
 
-    add_flags(driver, config, project, cpp, cmd);
+    add_flags(driver, config, project, cpp, &cmd);
 
     /* Add configured include paths */
     bake_attr *include_attr = driver->get_attr("include");