diff --git a/templates/vst3/src/vst3.c b/templates/vst3/src/vst3.c
index 3c823c5..8107076 100644
--- a/templates/vst3/src/vst3.c
+++ b/templates/vst3/src/vst3.c
@@ -74,6 +74,7 @@
 //   https://github.com/rubberduck-vba/Rubberduck/wiki/COM-in-plain-C
 //   https://devblogs.microsoft.com/oldnewthing/20040205-00/?p=40733
 
+//#define TIBIA_TRACE
 #ifdef TIBIA_TRACE
 # define TRACE(...)	printf(__VA_ARGS__); fflush(stdout);
 #else
@@ -391,8 +392,9 @@ static Steinberg_tresult pluginQueryInterface(pluginInstance *p, const Steinberg
 #endif
 	else {
 		TRACE(" not supported\n");
-		for (int i = 0; i < 16; i++)
+		for (int i = 0; i < 16; i++) {
 			TRACE(" %x", iid[i]);
+		}
 		TRACE("\n");
 		*obj = NULL;
 		return Steinberg_kNoInterface;
@@ -1542,8 +1544,9 @@ static Steinberg_tresult plugViewQueryInterface(void *thisInterface, const Stein
 		offset = offsetof(plugView, vtblIPlugView);
 	else {
 		TRACE(" not supported\n");
-		for (int i = 0; i < 16; i++)
+		for (int i = 0; i < 16; i++) {
 			TRACE(" %x", iid[i]);
+		}
 		TRACE("\n");
 		*obj = NULL;
 		return Steinberg_kNoInterface;
@@ -2024,8 +2027,9 @@ static Steinberg_tresult controllerQueryInterface(controller *c, const Steinberg
 #endif
 	else {
 		TRACE(" not supported\n");
-		for (int i = 0; i < 16; i++)
+		for (int i = 0; i < 16; i++) {
 			TRACE(" %x", iid[i]);
+		}
 		TRACE("\n");
 		*obj = NULL;
 		return Steinberg_kNoInterface;
@@ -2432,7 +2436,7 @@ static struct Steinberg_IPlugView* controllerCreateView(void* thisInterface, Ste
 
 	controller *c = (controller *)((char *)thisInterface - offsetof(controller, vtblIEditController));
 	size_t i;
-	for (i = 0; i < c->viewsCount; c++) {
+	for (i = 0; i < c->viewsCount; i++) {
 		if (c->views[i] != NULL) {
 			TRACE("controllerCreateView: trying to create another view - not supported \n");
 			return NULL;
@@ -2443,7 +2447,7 @@ static struct Steinberg_IPlugView* controllerCreateView(void* thisInterface, Ste
 	if (view == NULL)
 		return NULL;
 
-	for (i = 0; i < c->viewsCount; c++)
+	for (i = 0; i < c->viewsCount; i++)
 		if (c->views[i] == NULL)
 			break;
 	if (i == c->viewsCount) {
diff --git a/test/plugin.h b/test/plugin.h
index df79ee0..c3a3c23 100644
--- a/test/plugin.h
+++ b/test/plugin.h
@@ -43,7 +43,7 @@ typedef struct plugin {
 #if TEMPLATE_SUPPORTS_MESSAGING
 #include <stdio.h>
 static void plugin_receive_from_ui (plugin *instance, const void *data, size_t bytes) {
-	printf("plugin_receive_from_ui %ld bytes at %p: ", bytes, data);
+	printf("plugin_receive_from_ui %lld bytes at %p: ", bytes, data);
 	for (size_t i = 0; i < bytes; i++) {
 		printf("%c", ((uint8_t*) data)[i]);
 	}
diff --git a/test/plugin_ui.h b/test/plugin_ui.h
index 79fd6c5..30dfb87 100644
--- a/test/plugin_ui.h
+++ b/test/plugin_ui.h
@@ -41,7 +41,7 @@ typedef struct {
 #ifdef TEMPLATE_SUPPORTS_MESSAGING
 static void plugin_ui_receive_from_dsp (plugin_ui *instance, const void *data, size_t bytes) {
 	(void) instance;
-	printf("plugin_ui_receive_from_dsp %ld bytes at %p: ", bytes, data);
+	printf("plugin_ui_receive_from_dsp %lld bytes at %p: ", bytes, data);
 	for (size_t i = 0; i < bytes; i++) {
 		printf("%c", ((uint8_t*) data)[i]);
 	}