diff --git a/LEGO1/mxlist.h b/LEGO1/mxlist.h
index 80fa0e00..662767ce 100644
--- a/LEGO1/mxlist.h
+++ b/LEGO1/mxlist.h
@@ -76,7 +76,7 @@ class MxPtrList : public MxList<T*> {
 
 	static void Destroy(T* p_obj) { delete p_obj; };
 
-	void SetOwnership(MxBool p_ownership) { SetDestroy(p_ownership ? Destroy : MxCollection<T*>::Destroy); }
+	void SetOwnership(MxBool p_ownership) { MxPtrList<T>::SetDestroy(p_ownership ? MxList<T*>::Destroy : MxCollection<T*>::Destroy); }
 };
 
 template <class T>
diff --git a/LEGO1/mxqueue.h b/LEGO1/mxqueue.h
index b6eaad55..4e45c035 100644
--- a/LEGO1/mxqueue.h
+++ b/LEGO1/mxqueue.h
@@ -13,10 +13,10 @@ class MxQueue : public MxList<T> {
 
 	MxBool Dequeue(T& p_obj)
 	{
-		MxBool hasNext = (m_first != NULL);
-		if (m_first) {
-			p_obj = m_first->GetValue();
-			DeleteEntry(m_first);
+		MxBool hasNext = (this->m_first != NULL);
+		if (this->m_first) {
+			p_obj = this->m_first->GetValue();
+			this->DeleteEntry(this->m_first);
 		}
 
 		return hasNext;
diff --git a/LEGO1/mxstreamlist.h b/LEGO1/mxstreamlist.h
index f9164bfb..cbe53eae 100644
--- a/LEGO1/mxstreamlist.h
+++ b/LEGO1/mxstreamlist.h
@@ -11,11 +11,11 @@ class MxStreamList : public list<T> {
 public:
 	MxBool PopFront(T& p_obj)
 	{
-		if (empty())
+		if (this->empty())
 			return FALSE;
 
-		p_obj = front();
-		pop_front();
+		p_obj = this->front();
+		this->pop_front();
 		return TRUE;
 	}
 };