diff --git a/driver/main.cpp b/driver/main.cpp
index fa60727..dd72ddb 100644
--- a/driver/main.cpp
+++ b/driver/main.cpp
@@ -917,6 +917,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR lpCmdLine, int)
         booArgv[i+1] = argv[i];
 
     logvisor::CreateWin32Console();
+    SetConsoleOutputCP(65001);
     return wmain(argc+1, booArgv);
 }
 #endif
diff --git a/include/amuse/EffectBase.hpp b/include/amuse/EffectBase.hpp
index 67263dc..07d2aeb 100644
--- a/include/amuse/EffectBase.hpp
+++ b/include/amuse/EffectBase.hpp
@@ -6,7 +6,7 @@
 
 namespace amuse
 {
-class ChannelMap;
+struct ChannelMap;
 
 class EffectBaseTypeless
 {