diff --git a/cmake/FindCD.cmake b/cmake/FindCD.cmake
index 75f359c..6dc0bb0 100644
--- a/cmake/FindCD.cmake
+++ b/cmake/FindCD.cmake
@@ -17,7 +17,7 @@ include(SHSTKMacros)
 
 shstk_is_parent_exists(hasParent PARENT_DIRECTORY)
 
-shstk_set_find_dirs(cd)
+shstk_set_find_dirs(cd CD)
 set(_SEARCH_DIR ${cd_LIBDIR})
 
 if (NOT BUILDING_cd)
diff --git a/libs/core/cdutils_types.h b/libs/core/cdutils_types.h
index 8926a33..8cef173 100644
--- a/libs/core/cdutils_types.h
+++ b/libs/core/cdutils_types.h
@@ -173,7 +173,7 @@ protected:
 
 inline PICout operator <<(PICout s, const CDUtils::CDType & v) {
 	s.space();
-	s.setControl(0, true);
+	s.saveAndSetControls(0);
 	switch (v.cd_type()) {
 	case CDUtils::CDType::cdK : s << "K["; break;
 	case CDUtils::CDType::cdX : s << "X["; break;
@@ -182,7 +182,7 @@ inline PICout operator <<(PICout s, const CDUtils::CDType & v) {
 	default : s << "Null["; break;
 	}
 	s << v.name() << "(" << v.index() << ")] = " << v.value();
-	s.restoreControl();
+	s.restoreControls();
 	return s;
 }