diff --git a/public/datamodel/dmattributevar.h b/public/datamodel/dmattributevar.h
index e0ce32f5f..ab341227d 100644
--- a/public/datamodel/dmattributevar.h
+++ b/public/datamodel/dmattributevar.h
@@ -1152,7 +1152,7 @@ inline void CDmaElement<T>::Init( CDmElement *pOwner, const char *pAttributeName
 template <class T>
 inline UtlSymId_t CDmaElement<T>::GetElementType() const
 {
-	return this->Data().m_ElementType;
+	return this->Get().m_ElementType;
 }
 
 template <class T>
diff --git a/public/tier1/utlblockmemory.h b/public/tier1/utlblockmemory.h
index 35ef2da2e..3d62fe1bd 100644
--- a/public/tier1/utlblockmemory.h
+++ b/public/tier1/utlblockmemory.h
@@ -134,13 +134,15 @@ CUtlBlockMemory<T,I>::~CUtlBlockMemory()
 //-----------------------------------------------------------------------------
 // Fast swap
 //-----------------------------------------------------------------------------
+#include <utility>
+
 template< class T, class I >
 void CUtlBlockMemory<T,I>::Swap( CUtlBlockMemory< T, I > &mem )
 {
-	this->swap( m_pMemory, mem.m_pMemory );
-	this->swap( m_nBlocks, mem.m_nBlocks );
-	this->swap( m_nIndexMask, mem.m_nIndexMask );
-	this->swap( m_nIndexShift, mem.m_nIndexShift );
+	std::swap( m_pMemory, mem.m_pMemory );
+	std::swap( m_nBlocks, mem.m_nBlocks );
+	std::swap( m_nIndexMask, mem.m_nIndexMask );
+	std::swap( m_nIndexShift, mem.m_nIndexShift );
 }