diff --git a/LEGO1/mxstreamer.h b/LEGO1/mxstreamer.h
index 46fdf9ff..f7d1d448 100644
--- a/LEGO1/mxstreamer.h
+++ b/LEGO1/mxstreamer.h
@@ -18,11 +18,11 @@ class MxStreamerSubClass1 {
 
 	~MxStreamerSubClass1() { delete[] m_buffer; }
 
-	undefined4 GetSize() { return m_size; }
+	undefined4 GetSize() const { return m_size; }
 
 	void SetBuffer(undefined* p_buf) { m_buffer = p_buf; }
-	inline undefined* GetBuffer() { return m_buffer; }
-	inline undefined4 GetUnk08() { return m_unk08; }
+	inline undefined* GetBuffer() const { return m_buffer; }
+	inline undefined4 GetUnk08() const { return m_unk08; }
 
 private:
 	undefined* m_buffer;
@@ -95,8 +95,8 @@ class MxStreamer : public MxCore {
 	MxResult AddStreamControllerToOpenList(MxStreamController* p_stream);
 	MxResult FUN_100b99b0(MxDSAction* p_action);
 
-	inline const MxStreamerSubClass2 GetSubclass1() { return m_subclass1; }
-	inline const MxStreamerSubClass3 GetSubclass2() { return m_subclass2; }
+	inline const MxStreamerSubClass2& GetSubclass1() { return m_subclass1; }
+	inline const MxStreamerSubClass3& GetSubclass2() { return m_subclass2; }
 
 private:
 	list<MxStreamController*> m_openStreams; // 0x8