diff --git a/Main/Main.vcxproj b/Main/Main.vcxproj
index 7aff06fd..3e19c4d0 100644
--- a/Main/Main.vcxproj
+++ b/Main/Main.vcxproj
@@ -173,7 +173,7 @@
       <CompileAsManaged>false</CompileAsManaged>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <AdditionalOptions>/QIfist /Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/QIfist %(AdditionalOptions)</AdditionalOptions>
       <OmitFramePointers>true</OmitFramePointers>
       <CallingConvention>StdCall</CallingConvention>
       <FloatingPointExceptions>false</FloatingPointExceptions>
diff --git a/Main/src/Greaseweazle.h b/Main/src/Greaseweazle.h
index 5f309956..79acbc65 100644
--- a/Main/src/Greaseweazle.h
+++ b/Main/src/Greaseweazle.h
@@ -62,7 +62,7 @@
 		} driver;
 		const BYTE fddId;
 		const Utils::CCallocPtr<BYTE> dataBuffer;
-		#pragma pack(1);
+		#pragma pack(1)
 		struct{
 			BYTE major, minor, isMainFirmware, maxCmd;
 			DWORD sampleFrequency;
diff --git a/Main/src/KryoFluxBase.cpp b/Main/src/KryoFluxBase.cpp
index 346a90ab..a95cca46 100644
--- a/Main/src/KryoFluxBase.cpp
+++ b/Main/src/KryoFluxBase.cpp
@@ -212,7 +212,7 @@
 
 
 	struct TIndexPulse sealed{
-		DWORD posInStreamData;
+		int posInStreamData;
 		DWORD sampleCounter;
 		DWORD indexCounter;
 	};
@@ -365,7 +365,7 @@ badFormat:		::SetLastError(ERROR_BAD_FORMAT);
 		DWORD sampleCounter=0, totalSampleCounter=0; // delta and absolute sample counters
 		PLogTime buffer=result.GetBuffer(),pLogTime=buffer;
 		BYTE nearestIndexPulse=0;
-		DWORD nearestIndexPulsePos= nIndexPulses>0 ? indexPulses[0].posInStreamData : INT_MAX;
+		int nearestIndexPulsePos= nIndexPulses>0 ? indexPulses[0].posInStreamData : INT_MAX;
 		for( PCBYTE pis=inStreamData,pLastInStreamData=pis+inStreamDataLength; pis<pLastInStreamData; ){
 			const BYTE header=*pis++;
 			// . extracting flux from the KryoFlux "in-Stream" data (pre-processed in ctor)
@@ -399,7 +399,7 @@ badFormat:		::SetLastError(ERROR_BAD_FORMAT);
 					result.AddIndexTime( (LONGLONG)TIME_SECOND(1)*indexSampleCounter/SampleClockDefault ); // temporary 64-bit precision even on 32-bit machines
 				else // custom Sample-Clock, involving floating-point number computation
 					result.AddIndexTime( (double)TIME_SECOND(1)*indexSampleCounter/sck ); // temporary 64-bit precision even on 32-bit machines
-				nearestIndexPulsePos= ++nearestIndexPulse<nIndexPulses ? indexPulses[nearestIndexPulse].posInStreamData : -1;
+				nearestIndexPulsePos= ++nearestIndexPulse<nIndexPulses ? indexPulses[nearestIndexPulse].posInStreamData : INT_MAX;
 			}
 			// . adding the flux into the Buffer
 			totalSampleCounter+=sampleCounter;
diff --git a/Main/src/SpectrumDos.cpp b/Main/src/SpectrumDos.cpp
index 53a152b4..4a7ea570 100644
--- a/Main/src/SpectrumDos.cpp
+++ b/Main/src/SpectrumDos.cpp
@@ -30,7 +30,7 @@
 	#define FORMAT_ADDITIONAL_COUNT	2
 
 	#define TAPE_EXTENSION	_T(".tap")
-	#define TAPE_FILTER		_T("Tape (*") TAPE_EXTENSION _T(")|*") TAPE_EXTENSION
+	#define TAPE_FILTER		_T("Tape (*") TAPE_EXTENSION _T(")|*") TAPE_EXTENSION _T("|")
 
 	CDos::TCmdResult CSpectrumDos::ProcessCommand(WORD cmd){
 		// returns the Result of processing a DOS-related command
diff --git a/Main/src/Utils.cpp b/Main/src/Utils.cpp
index 13533431..fb68d986 100644
--- a/Main/src/Utils.cpp
+++ b/Main/src/Utils.cpp
@@ -1548,7 +1548,7 @@ namespace Utils{
 	static constexpr TCHAR RangeSign='-'; // "minus"
 	static constexpr TCHAR Delimiters[]={ ',', ';', RangeSign, '\0' }; // valid integer delimiters, INCLUDING RangeSign
 
-	bool CRideDialog::GetDlgItemIntList(WORD id,CIntList &rOutList,const PropGrid::Integer::TUpDownLimits &limits,UINT nIntsMin,UINT nIntsMax) const{
+	bool CRideDialog::GetDlgItemIntList(WORD id,CIntList &rOutList,const PropGrid::Integer::TUpDownLimits &limits,int nIntsMin,int nIntsMax) const{
 		// True <=> item with the specified ID contains list of integer values (grammar bellow), otherwise False
 		// - elimination of white spaces from the content
 		TCHAR buf[16384], *pEnd=buf;
diff --git a/Main/src/Utils.h b/Main/src/Utils.h
index 543f1d43..941046fd 100644
--- a/Main/src/Utils.h
+++ b/Main/src/Utils.h
@@ -263,7 +263,7 @@ namespace Utils{
 		void SetDlgItemSingleCharUsingFont(WORD id,WCHAR singleChar,LPCTSTR fontFace,int fontPointSize) const;
 		void PopulateDlgComboBoxWithSequenceOfNumbers(WORD cbId,BYTE iStartValue,LPCTSTR strStartValueDesc,BYTE iEndValue,LPCTSTR strEndValueDesc) const;
 		void ConvertDlgButtonToSplitButton(WORD id,PCSplitButtonAction pAction,BYTE nActions) const;
-		bool GetDlgItemIntList(WORD id,CIntList &rOutList,const PropGrid::Integer::TUpDownLimits &limits,UINT nIntsMin=0,UINT nIntsMax=INT_MAX) const;
+		bool GetDlgItemIntList(WORD id,CIntList &rOutList,const PropGrid::Integer::TUpDownLimits &limits,int nIntsMin=0,int nIntsMax=INT_MAX) const;
 		void SetDlgItemIntList(WORD id,const CIntList &list) const;
 	};
 
diff --git a/PropGrid/PropGrid.vcxproj b/PropGrid/PropGrid.vcxproj
index 0290bf2c..81ef22f8 100644
--- a/PropGrid/PropGrid.vcxproj
+++ b/PropGrid/PropGrid.vcxproj
@@ -172,7 +172,6 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalOptions>/QIfist %(AdditionalOptions)</AdditionalOptions>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <FloatingPointExceptions>false</FloatingPointExceptions>
diff --git a/PropGrid/src/Editor_Enum.cpp b/PropGrid/src/Editor_Enum.cpp
index 68a862a0..3a6d8ccd 100644
--- a/PropGrid/src/Editor_Enum.cpp
+++ b/PropGrid/src/Editor_Enum.cpp
@@ -39,7 +39,7 @@
 				uValue.longValue=0;
 			::memcpy( &uValue, value.buffer, valueSize );
 			WCHAR desc[STRING_LENGTH_MAX+1];
-			__drawString__(	__getValueDescW__( value.param, uValue, desc, sizeof(desc)/sizeof(WCHAR) ), -1,
+			__drawString__(	__getValueDescW__( value.param, uValue, desc, ARRAYSIZE(desc) ), -1,
 							pdis
 						);
 		}
@@ -87,7 +87,7 @@
 					// string Value
 					WCHAR descW[100];
 					ComboBox_SetItemData(	hComboBox,
-											::SendMessageW( hComboBox, CB_ADDSTRING, 0, (LPARAM)__getValueDescW__(value.param,uValue,descW,sizeof(descW)/sizeof(WCHAR)) ),
+											::SendMessageW( hComboBox, CB_ADDSTRING, 0, (LPARAM)__getValueDescW__(value.param,uValue,descW,ARRAYSIZE(descW)) ),
 											uValue.longValue
 										);
 				}
diff --git a/PropGrid/src/Editor_Hyperlink.cpp b/PropGrid/src/Editor_Hyperlink.cpp
index 7059a330..fd81a0db 100644
--- a/PropGrid/src/Editor_Hyperlink.cpp
+++ b/PropGrid/src/Editor_Hyperlink.cpp
@@ -45,7 +45,7 @@
 		if (wideChar)
 			::lstrcpyW(buf+1,(LPCWSTR)value.buffer);
 		else
-			::MultiByteToWideChar( CP_ACP, 0, (LPCSTR)value.buffer,-1, buf+1,sizeof(buf)/sizeof(WCHAR)-1 );
+			::MultiByteToWideChar( CP_ACP, 0, (LPCSTR)value.buffer,-1, buf+1,ARRAYSIZE(buf)-1 );
 		return ::CreateWindowW(	WC_LINK,
 								buf,
 								EDITOR_STYLE,
diff --git a/PropGrid/src/Editor_Integer.cpp b/PropGrid/src/Editor_Integer.cpp
index 58fb0188..edabec48 100644
--- a/PropGrid/src/Editor_Integer.cpp
+++ b/PropGrid/src/Editor_Integer.cpp
@@ -49,7 +49,7 @@
 		// True <=> Editor's current Value is acceptable, otherwise False
 		const HWND hEdit=TEditor::pSingleShown->hMainCtrl;
 		TCHAR buf[16];
-		const int nChars=::GetWindowText( hEdit, buf, sizeof(buf)/sizeof(TCHAR) );
+		const int nChars=::GetWindowText( hEdit, buf, ARRAYSIZE(buf) );
 		static_assert( PropGrid::Integer::HEXADECIMAL==1, "PropGrid::Integer::HEXADECIMAL==1" );
 		const int i=_tcstol( buf, nullptr, 10+6*(features&PropGrid::Integer::HEXADECIMAL) );
 		const bool outOfRange=	features&PropGrid::Integer::HEXADECIMAL
diff --git a/PropGrid/src/api.cpp b/PropGrid/src/api.cpp
index 144bd51e..f44e2768 100644
--- a/PropGrid/src/api.cpp
+++ b/PropGrid/src/api.cpp
@@ -55,7 +55,7 @@
 	HANDLE WINAPI PropGrid::AddPropertyA(HWND hPropGrid,HANDLE category,LPCSTR name,PValue value,PCEditor editor,PCustomParam param){
 		// creates, adds into PropertyGrid, and returns a new ValueItem with given Name and Value
 		WCHAR bufW[200];
-		::MultiByteToWideChar( CP_ACP, 0, name, -1, bufW, sizeof(bufW)/sizeof(WCHAR) );
+		::MultiByteToWideChar( CP_ACP, 0, name, -1, bufW, ARRAYSIZE(bufW) );
 		return AddPropertyW( hPropGrid, category, bufW, value, editor, param );
 	}
 
@@ -70,7 +70,7 @@
 	HANDLE WINAPI PropGrid::AddDisabledPropertyA(HWND hPropGrid,HANDLE category,LPCSTR name,PValue value,PCEditor editor,PCustomParam param){
 		// creates, adds into PropertyGrid, and returns a new ValueItem with given Name and Value
 		WCHAR bufW[200];
-		::MultiByteToWideChar( CP_ACP, 0, name, -1, bufW, sizeof(bufW)/sizeof(WCHAR) );
+		::MultiByteToWideChar( CP_ACP, 0, name, -1, bufW, ARRAYSIZE(bufW) );
 		return AddDisabledPropertyW( hPropGrid, category, bufW, value, editor, param );
 	}
 
@@ -92,7 +92,7 @@
 	HANDLE WINAPI PropGrid::AddCategoryA(HWND hPropGrid,HANDLE category,LPCSTR name,bool initiallyExpanded){
 		// creates, adds into PropertyGrid, and returns a new CategoryItem with given Name
 		WCHAR bufW[200];
-		::MultiByteToWideChar( CP_ACP, 0, name, -1, bufW, sizeof(bufW)/sizeof(WCHAR) );
+		::MultiByteToWideChar( CP_ACP, 0, name, -1, bufW, ARRAYSIZE(bufW) );
 		return AddCategoryW( hPropGrid, category, bufW, initiallyExpanded );
 	}
 
diff --git a/Tdi/Tdi.vcxproj b/Tdi/Tdi.vcxproj
index 18073219..e90ddf72 100644
--- a/Tdi/Tdi.vcxproj
+++ b/Tdi/Tdi.vcxproj
@@ -149,7 +149,6 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <StructMemberAlignment>Default</StructMemberAlignment>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <AdditionalOptions>/QIfist %(AdditionalOptions)</AdditionalOptions>
       <FloatingPointExceptions>false</FloatingPointExceptions>
       <DisableSpecificWarnings>4482;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
diff --git a/Tdi/src/Tdi.cpp b/Tdi/src/Tdi.cpp
index 731bbf46..e58da0dc 100644
--- a/Tdi/src/Tdi.cpp
+++ b/Tdi/src/Tdi.cpp
@@ -31,7 +31,7 @@
 		: tabId(_tabId) {
 		data.mask = TCIF_PARAM | TCIF_TEXT;
 		data.pszText=caption;
-		data.cchTextMax=sizeof(caption)/sizeof(TCHAR);
+		data.cchTextMax=ARRAYSIZE(caption);
 		TabCtrl_GetItem(hTdi,_tabId,&data);
 		TabCtrl_GetItemRect(hTdi,_tabId,&targetArea);
 	}
@@ -189,7 +189,7 @@
 								TCHAR tmpCaption[80];
 								tmp.mask = TCIF_PARAM | TCIF_TEXT;
 								tmp.pszText=tmpCaption;
-								tmp.cchTextMax=sizeof(tmpCaption)/sizeof(TCHAR);
+								tmp.cchTextMax=ARRAYSIZE(tmpCaption);
 							TabCtrl_GetItem( hTdi, iTargetTab, &tmp );
 							TabCtrl_SetItem( hTdi, iTargetTab, &pDraggedTabInfo->data );
 							TabCtrl_SetItem( hTdi, pDraggedTabInfo->tabId, &tmp );