diff --git a/Source/UI/AdventureGuide/UIAdventureGuide.cpp b/Source/UI/AdventureGuide/UIAdventureGuide.cpp
index a9d811aa3..5df15adea 100644
--- a/Source/UI/AdventureGuide/UIAdventureGuide.cpp
+++ b/Source/UI/AdventureGuide/UIAdventureGuide.cpp
@@ -29,6 +29,15 @@
 #include <regex>
 #include <utility>
 
+using StatusRequestTree = std::_Tree<std::_Tset_traits<unsigned int, std::less<unsigned int>, std::allocator<unsigned int>, false>>;
+extern template std::_Tree_find_result<std::_Tree_node<unsigned int, void*>*>
+StatusRequestTree::_Find_lower_bound<unsigned int>(const unsigned int&) const;
+extern template AdventureGuide::CUIQuestInfo** std::allocator<AdventureGuide::CUIQuestInfo*>::allocate(std::size_t);
+extern template void std::_List_node<AdventureGuide::CItemData, void*>::_Free_non_head(
+  std::allocator<std::_List_node<AdventureGuide::CItemData, void*>>&, std::_List_node<AdventureGuide::CItemData, void*>*) noexcept;
+extern template void std::_List_node<AdventureGuide::CQuestInfo, void*>::_Free_non_head(
+  std::allocator<std::_List_node<AdventureGuide::CQuestInfo, void*>>&, std::_List_node<AdventureGuide::CQuestInfo, void*>*) noexcept;
+
 namespace {
 
 template <std::size_t Length>
diff --git a/Source/UI/Items/UIGradeEnchantWnd.cpp b/Source/UI/Items/UIGradeEnchantWnd.cpp
index b0a2f2d71..e2e8deae2 100644
--- a/Source/UI/Items/UIGradeEnchantWnd.cpp
+++ b/Source/UI/Items/UIGradeEnchantWnd.cpp
@@ -178,8 +178,11 @@ void UIGradeEnchantWnd::OnCreate(int, int) {
   start->Resize(start->BitmapWidth(), start->BitmapHeight());
   this->startButton->Move(0x23, 0x123);
   this->startButton->SetId(0xB8);
-  this->startButton->SetDisabled(0);
-  this->startButton->Invalidate();
+  {
+    UIGradeEnchant_BtnStart* button = this->startButton;
+    button->SetDisabled(0);
+    button->Invalidate();
+  }
   this->AddChild(this->startButton);
 
   UIGradeEnchant_BtnEnhancedUp* enhancedUp = new UIGradeEnchant_BtnEnhancedUp();
@@ -190,8 +193,11 @@ void UIGradeEnchantWnd::OnCreate(int, int) {
   enhancedUp->Resize(enhancedUp->BitmapWidth(), enhancedUp->BitmapHeight());
   this->enhancedUpButton->Move(0x9E, 0xE1);
   this->enhancedUpButton->SetId(0x117);
-  this->enhancedUpButton->SetDisabled(0);
-  this->enhancedUpButton->Invalidate();
+  {
+    UIGradeEnchant_BtnEnhancedUp* button = this->enhancedUpButton;
+    button->SetDisabled(0);
+    button->Invalidate();
+  }
   this->AddChild(this->enhancedUpButton);
 
   UIGradeEnchant_BtnEnhancedDown* enhancedDown = new UIGradeEnchant_BtnEnhancedDown();
@@ -202,8 +208,11 @@ void UIGradeEnchantWnd::OnCreate(int, int) {
   enhancedDown->Resize(enhancedDown->BitmapWidth(), enhancedDown->BitmapHeight());
   this->enhancedDownButton->Move(0x9E, 0xF0);
   this->enhancedDownButton->SetId(0x118);
-  this->enhancedDownButton->SetDisabled(0);
-  this->enhancedDownButton->Invalidate();
+  {
+    UIGradeEnchant_BtnEnhancedDown* button = this->enhancedDownButton;
+    button->SetDisabled(0);
+    button->Invalidate();
+  }
   this->AddChild(this->enhancedDownButton);
 
   auto* help = new UIBitmapButton();