diff --git a/include/WinStd/Common.h b/include/WinStd/Common.h
index c818ed5a..d5c28e4f 100644
--- a/include/WinStd/Common.h
+++ b/include/WinStd/Common.h
@@ -687,7 +687,7 @@ static _Success_(return != 0) int SecureMultiByteToWideChar(_In_ UINT CodePage,
 template<class _Traits, class _Ax>
 static DWORD FormatMessageA(_In_ DWORD dwFlags, _In_opt_ LPCVOID lpSource, _In_ DWORD dwMessageId, _In_ DWORD dwLanguageId, _Inout_ std::basic_string<char, _Traits, _Ax> &str, _In_opt_ va_list *Arguments)
 {
-	LPSTR lpBuffer;
+    LPSTR lpBuffer;
     DWORD dwResult = FormatMessageA(dwFlags | FORMAT_MESSAGE_ALLOCATE_BUFFER, lpSource, dwMessageId, dwLanguageId, reinterpret_cast<LPSTR>(&lpBuffer), 0, Arguments);
     if (dwResult) {
         str.assign(lpBuffer, dwResult);
@@ -1098,7 +1098,7 @@ namespace winstd
         ///
         /// \return Object handle
         ///
-        handle_type detach()
+        handle_type detach() noexcept
         {
             handle_type h = m_h;
             m_h = invalid;