Index: include/NSCHelper.cpp
===================================================================
--- include/NSCHelper.cpp	(revision 1bfe6f01b8f1eb9dce28c472f0847de2fb63dc5f)
+++ include/NSCHelper.cpp	(revision 50a5db2a0d330a76ccb14940ec7ee918f51cd718)
@@ -108,5 +108,5 @@
 bool NSCHelper::report::matches(unsigned int report, NSCAPI::nagiosReturn code) {
 	return (
-		(code == NSCAPI::returnOK && (report&REPORT_OK)==REPORT_OK) ||
+		(code == NSCAPI::returnOK && ((report&REPORT_OK)==REPORT_OK) ) ||
 		(code == NSCAPI::returnCRIT && ((report&REPORT_ERROR)==REPORT_ERROR) ) ||
 		(code == NSCAPI::returnWARN && ((report&REPORT_WARNING)==REPORT_WARNING) ) ||
Index: modules/CheckHelpers/CheckHelpers.cpp
===================================================================
--- modules/CheckHelpers/CheckHelpers.cpp	(revision 79e734fc362a0864f46eab6a01ceb73ea8fb38e7)
+++ modules/CheckHelpers/CheckHelpers.cpp	(revision 50a5db2a0d330a76ccb14940ec7ee918f51cd718)
@@ -47,4 +47,5 @@
 		NSCModuleHelper::registerCommand(_T("CheckMultiple"), _T("Run more then one check and return the worst state."));
 		NSCModuleHelper::registerCommand(_T("CheckOK"), _T("Just return OK (anything passed along will be used as a message)."));
+		NSCModuleHelper::registerCommand(_T("check_ok"), _T("Just return OK (anything passed along will be used as a message)."));
 		NSCModuleHelper::registerCommand(_T("CheckWARNING"), _T("Just return WARN (anything passed along will be used as a message)."));
 		NSCModuleHelper::registerCommand(_T("CheckCRITICAL"), _T("Just return CRIT (anything passed along will be used as a message)."));
@@ -93,4 +94,6 @@
 		return NSCAPI::returnOK;
 	} else if (command == _T("CheckOK")) {
+		return checkSimpleStatus(NSCAPI::returnOK, argLen, char_args, msg, perf);
+	} else if (command == _T("check_ok")) {
 		return checkSimpleStatus(NSCAPI::returnOK, argLen, char_args, msg, perf);
 	} else if (command == _T("CheckWARNING")) {
Index: modules/Scheduler/Scheduler.cpp
===================================================================
--- modules/Scheduler/Scheduler.cpp	(revision 1bfe6f01b8f1eb9dce28c472f0847de2fb63dc5f)
+++ modules/Scheduler/Scheduler.cpp	(revision 50a5db2a0d330a76ccb14940ec7ee918f51cd718)
@@ -124,4 +124,5 @@
 		std::wstring msg, perf;
 		NSCAPI::nagiosReturn code = NSCModuleHelper::InjectCommand(item.command.c_str(), item.arguments, msg, perf);
+		std::wcout << _T("Testing: ") << item.report << _T(" .. ") << code << _T("?") << std::endl;
 		if (NSCHelper::report::matches(item.report, code)) {
 			NSCModuleHelper::NotifyChannel(item.channel, item.alias, code, msg, perf);
Index: service/NSClient++.cpp
===================================================================
--- service/NSClient++.cpp	(revision 6822839fc0a27ea7ff91a877c670984306ba3c34)
+++ service/NSClient++.cpp	(revision 50a5db2a0d330a76ccb14940ec7ee918f51cd718)
@@ -378,4 +378,5 @@
 			return nRetCode;
 		} else if ( wcscasecmp( _T("test"), argv[1]+1 ) == 0 ) {
+			g_bConsoleLog = true;
 			bool server = false;
 			if (argc > 2 && wcscasecmp( _T("server"), argv[2] ) == 0 ) {
@@ -394,5 +395,4 @@
 #endif
 			nsclient::simple_client client(&mainClient);
-			g_bConsoleLog = true;
 			client.start();
 			return 0;
@@ -1205,23 +1205,25 @@
 			}
 			if (g_bConsoleLog) {
-				std::string k = "?";
+				std::wstring k = _T("?");
 				switch (msgType) {
 				case NSCAPI::critical:
-					k ="c";
+					k =_T("c");
 					break;
 				case NSCAPI::warning:
-					k ="w";
+					k =_T("w");
 					break;
 				case NSCAPI::error:
-					k ="e";
+					k =_T("e");
 					break;
 				case NSCAPI::log:
-					k ="l";
+					k =_T("l");
 					break;
 				case NSCAPI::debug:
-					k ="d";
+					k =_T("d");
 					break;
-				}	
-				std::cout << k << " " << strEx::wstring_to_string(file_stl) << "(" << line << ") " << strEx::wstring_to_string(message) << std::endl;
+				default:
+					k =_T("?");
+				}
+				std::wcout << k << _T(" ") << file_stl << _T("(") << line << _T(") ") << message << std::endl;
 			}
 			if (!plugins_loaded_) {