diff --git a/src/xenia/kernel/util/shim_utils.h b/src/xenia/kernel/util/shim_utils.h
index 1b5ec0d6c..f8248f4eb 100644
--- a/src/xenia/kernel/util/shim_utils.h
+++ b/src/xenia/kernel/util/shim_utils.h
@@ -210,7 +210,7 @@ class PrimitivePointerParam : public ParamBase<uint32_t> {
     return reinterpret_cast<uintptr_t>(host_ptr_);
   }
   T value() const { return *host_ptr_; }
-  operator T() const { return *host_ptr_; }
+  operator T() const = delete;
   operator xe::be<T>*() const { return host_ptr_; }
   operator bool() const { return host_ptr_ != nullptr; }
   void Zero() const {
diff --git a/src/xenia/kernel/xam/xam_info.cc b/src/xenia/kernel/xam/xam_info.cc
index bbc67c6da..698500456 100644
--- a/src/xenia/kernel/xam/xam_info.cc
+++ b/src/xenia/kernel/xam/xam_info.cc
@@ -175,7 +175,7 @@ dword_result_t XamAlloc(dword_t unk, dword_t size, lpdword_t out_ptr) {
 DECLARE_XAM_EXPORT(XamAlloc, ExportTag::kImplemented);
 
 dword_result_t XamFree(lpdword_t ptr) {
-  kernel_state()->memory()->SystemHeapFree(ptr);
+  kernel_state()->memory()->SystemHeapFree(ptr.guest_address());
 
   return X_ERROR_SUCCESS;
 }