diff --git a/src/xenia/kernel/kernel_state.cc b/src/xenia/kernel/kernel_state.cc
index 2ac398199..739bb34b1 100644
--- a/src/xenia/kernel/kernel_state.cc
+++ b/src/xenia/kernel/kernel_state.cc
@@ -99,10 +99,6 @@ KernelState::~KernelState() {
     dispatch_thread_->Wait(0, 0, 0, nullptr);
   }
 
-  if (process_info_block_address_) {
-    memory_->SystemHeapFree(process_info_block_address_);
-  }
-
   executable_module_.reset();
   user_modules_.clear();
   kernel_modules_.clear();
@@ -115,6 +111,10 @@ KernelState::~KernelState() {
 
   delete dispatcher_;
 
+  if (process_info_block_address_) {
+    memory_->SystemHeapFree(process_info_block_address_);
+  }
+
   assert_true(shared_kernel_state_ == this);
   shared_kernel_state_ = nullptr;
 }
diff --git a/src/xenia/kernel/objects/xuser_module.cc b/src/xenia/kernel/objects/xuser_module.cc
index 9526c6f77..7b2400b86 100644
--- a/src/xenia/kernel/objects/xuser_module.cc
+++ b/src/xenia/kernel/objects/xuser_module.cc
@@ -588,7 +588,7 @@ void XUserModule::Dump() {
           }
         }
       }
-      float total_count = static_cast<float>(import_info_count) * 100.0f;
+      float total_count = static_cast<float>(import_info_count) / 100.0f;
       printf("         Total: %4llu\n", import_info_count);
       printf("         Known:  %3d%% (%d known, %d unknown)\n",
              static_cast<int>(known_count / total_count), known_count,
diff --git a/src/xenia/kernel/xobject.h b/src/xenia/kernel/xobject.h
index 4488d5b17..8ecec925e 100644
--- a/src/xenia/kernel/xobject.h
+++ b/src/xenia/kernel/xobject.h
@@ -208,8 +208,8 @@ template <typename T>
 class object_ref {
  public:
   object_ref() noexcept : value_(nullptr) {}
-  object_ref(nullptr_t) noexcept : value_(nullptr) {
-  }  // NOLINT(runtime/explicit)
+  object_ref(nullptr_t) noexcept  // NOLINT(runtime/explicit)
+      : value_(nullptr) {}
   object_ref& operator=(nullptr_t) noexcept {
     reset();
     return (*this);
diff --git a/src/xenia/ui/file_picker_win.cc b/src/xenia/ui/file_picker_win.cc
index 1354329e3..9014b60cb 100644
--- a/src/xenia/ui/file_picker_win.cc
+++ b/src/xenia/ui/file_picker_win.cc
@@ -36,9 +36,11 @@ class CDialogEventHandler : public IFileDialogEvents,
   IFACEMETHODIMP QueryInterface(REFIID riid, void** ppv) {
     static const QITAB qit[] = {
         {&__uuidof(IFileDialogEvents),
-         (int)OFFSETOFCLASS(IFileDialogEvents, CDialogEventHandler)},
+         static_cast<int>(
+             OFFSETOFCLASS(IFileDialogEvents, CDialogEventHandler))},
         {&__uuidof(IFileDialogControlEvents),
-         (int)OFFSETOFCLASS(IFileDialogControlEvents, CDialogEventHandler)},
+         static_cast<int>(
+             OFFSETOFCLASS(IFileDialogControlEvents, CDialogEventHandler))},
         {0},
     };
     return QISearch(this, qit, riid, ppv);
@@ -53,33 +55,33 @@ class CDialogEventHandler : public IFileDialogEvents,
   }
 
   // IFileDialogEvents methods
-  IFACEMETHODIMP OnFileOk(IFileDialog*) { return S_OK; };
-  IFACEMETHODIMP OnFolderChange(IFileDialog*) { return S_OK; };
-  IFACEMETHODIMP OnFolderChanging(IFileDialog*, IShellItem*) { return S_OK; };
-  IFACEMETHODIMP OnHelp(IFileDialog*) { return S_OK; };
-  IFACEMETHODIMP OnSelectionChange(IFileDialog*) { return S_OK; };
+  IFACEMETHODIMP OnFileOk(IFileDialog*) { return S_OK; }
+  IFACEMETHODIMP OnFolderChange(IFileDialog*) { return S_OK; }
+  IFACEMETHODIMP OnFolderChanging(IFileDialog*, IShellItem*) { return S_OK; }
+  IFACEMETHODIMP OnHelp(IFileDialog*) { return S_OK; }
+  IFACEMETHODIMP OnSelectionChange(IFileDialog*) { return S_OK; }
   IFACEMETHODIMP OnShareViolation(IFileDialog*, IShellItem*,
                                   FDE_SHAREVIOLATION_RESPONSE*) {
     return S_OK;
-  };
-  IFACEMETHODIMP OnTypeChange(IFileDialog* pfd) { return S_OK; };
+  }
+  IFACEMETHODIMP OnTypeChange(IFileDialog* pfd) { return S_OK; }
   IFACEMETHODIMP OnOverwrite(IFileDialog*, IShellItem*,
                              FDE_OVERWRITE_RESPONSE*) {
     return S_OK;
-  };
+  }
 
   // IFileDialogControlEvents methods
   IFACEMETHODIMP OnItemSelected(IFileDialogCustomize* pfdc, DWORD dwIDCtl,
                                 DWORD dwIDItem) {
     return S_OK;
-  };
-  IFACEMETHODIMP OnButtonClicked(IFileDialogCustomize*, DWORD) { return S_OK; };
+  }
+  IFACEMETHODIMP OnButtonClicked(IFileDialogCustomize*, DWORD) { return S_OK; }
   IFACEMETHODIMP OnCheckButtonToggled(IFileDialogCustomize*, DWORD, BOOL) {
     return S_OK;
-  };
+  }
   IFACEMETHODIMP OnControlActivating(IFileDialogCustomize*, DWORD) {
     return S_OK;
-  };
+  }
 
   CDialogEventHandler() : _cRef(1) {}
 
diff --git a/third_party/elemental-forms b/third_party/elemental-forms
index 2c5b58821..5da70a8d7 160000
--- a/third_party/elemental-forms
+++ b/third_party/elemental-forms
@@ -1 +1 @@
-Subproject commit 2c5b58821f4fd94d890d2d3126bee6169232e52c
+Subproject commit 5da70a8d7663a6c360436b9ba168a96ad145f45d