diff --git a/ee.linux.cbp b/ee.linux.cbp
index 402fd09a5..133be051f 100644
--- a/ee.linux.cbp
+++ b/ee.linux.cbp
@@ -14,6 +14,7 @@
 				<Compiler>
 					<Add option="-g" />
 					<Add option="-DEE_DEBUG" />
+					<Add option="-DEE_MEMORY_MANAGER" />
 				</Compiler>
 			</Target>
 			<Target title="Release">
@@ -31,7 +32,6 @@
 		</Build>
 		<Compiler>
 			<Add option="-Wall" />
-			<Add option="-DEE_MEMORY_MANAGER" />
 		</Compiler>
 		<Linker>
 			<Add library="GL" />
@@ -536,6 +536,8 @@
 		<Unit filename="src/ui/cuiskincomplex.hpp" />
 		<Unit filename="src/ui/cuiskinsimple.cpp" />
 		<Unit filename="src/ui/cuiskinsimple.hpp" />
+		<Unit filename="src/ui/cuiskinstate.cpp" />
+		<Unit filename="src/ui/cuiskinstate.hpp" />
 		<Unit filename="src/ui/cuislider.cpp" />
 		<Unit filename="src/ui/cuislider.hpp" />
 		<Unit filename="src/ui/cuisliderbutton.cpp" />
diff --git a/src/base.hpp b/src/base.hpp
index 2b0a39bc9..71e24a36b 100644
--- a/src/base.hpp
+++ b/src/base.hpp
@@ -56,6 +56,12 @@
 #define EE_COMPILER_GCC
 #endif
 
+#ifndef EE_DEBUG
+	#if defined( DEBUG ) || defined( _DEBUG ) || defined( __DEBUG )
+	#define EE_DEBUG
+	#endif
+#endif
+
 #if defined(__x86_64__) || \
 	(defined(_WIN64) && !defined(_XBOX)) || \
 	defined(__64BIT__) || defined(__LP64)  || defined(__LP64__) || defined(_LP64) || defined(_ADDR64) || defined(_CRAYC) || defined(__arch64__) || \
diff --git a/src/base/debug.cpp b/src/base/debug.cpp
index b145e5556..ec464e36d 100644
--- a/src/base/debug.cpp
+++ b/src/base/debug.cpp
@@ -2,6 +2,8 @@
 
 namespace EE {
 
+#ifdef EE_DEBUG
+
 void eeREPORT_ASSERT( const char * File, int Line, const char * Exp ) {
 	#ifdef EE_COMPILER_MSVC
 
@@ -67,4 +69,6 @@ void eePRINTC( unsigned int cond, const char * format, ...) {
 	#endif
 }
 
+#endif
+
 }
diff --git a/src/base/debug.hpp b/src/base/debug.hpp
index 61b447fff..95a438df2 100644
--- a/src/base/debug.hpp
+++ b/src/base/debug.hpp
@@ -19,8 +19,14 @@ void eePRINTC	( unsigned int cond, const char * format, ... );
 
 #define eeASSERT( expr )
 #define eeASSERTM( expr, msg )
+
+#ifdef EE_COMPILER_GCC
+#define eePRINT( format, args... ) {}
+#define eePRINTC( cond, format, args... ) {}
+#else
 #define eePRINT
 #define eePRINTC
+#endif
 
 #endif
 
diff --git a/src/helper/SOIL/SOIL.c b/src/helper/SOIL/SOIL.c
index 607516a90..467b6ba64 100755
--- a/src/helper/SOIL/SOIL.c
+++ b/src/helper/SOIL/SOIL.c
@@ -2015,8 +2015,12 @@ int query_DXT_capability( void )
 				CFRelease( extensionName );
 				CFRelease( bundle );
 			#else
-				ext_addr = (P_SOIL_GLCOMPRESSEDTEXIMAGE2DPROC)
-						glXGetProcAddressARB
+				ext_addr = (P_SOIL_GLCOMPRESSEDTEXIMAGE2DPROC)
+						#if !defined(GLX_VERSION_1_4)
+						glXGetProcAddressARB
+						#else
+						glXGetProcAddress
+						#endif
 						(
 							(const GLubyte *)"glCompressedTexImage2DARB"
 						);
diff --git a/src/test/ee.cpp b/src/test/ee.cpp
index ecbe96ded..c951f68b1 100644
--- a/src/test/ee.cpp
+++ b/src/test/ee.cpp
@@ -482,23 +482,23 @@ void cEETest::CreateUI() {
 	mSlider = eeNew( cUISlider, ( SliderParams ) );
 	mSlider->Visible( true );
 	mSlider->Enabled( true );
-	
+
 	SliderParams.PosSet( 60, 120 );
 	mSlider = eeNew( cUISlider, ( SliderParams ) );
 	mSlider->Visible( true );
 	mSlider->Enabled( true );
-	
+
 	cUISpinBox::CreateParams SpinBoxParams;
 	SpinBoxParams.Parent( C );
 	SpinBoxParams.PosSet( 80, 150 );
-	SpinBoxParams.Size = eeSize( 80, 23 );
+	SpinBoxParams.Size = eeSize( 80, 24 );
 	SpinBoxParams.Flags = UI_VALIGN_CENTER | UI_HALIGN_LEFT | UI_CLIP_ENABLE;
 	SpinBoxParams.Font = TTF;
 	SpinBoxParams.AllowDotsInNumbers = true;
 	cUISpinBox * mSpinBox = eeNew( cUISpinBox, ( SpinBoxParams ) );
 	mSpinBox->Visible( true );
 	mSpinBox->Enabled( true );
-	mSpinBox->Padding( eeRectf( 2, 0, -2, 0 ) );
+	mSpinBox->Padding( eeRectf( 3, -1, 0, 0 ) );
 
 	cUIScrollBar::CreateParams ScrollBarP;
 	ScrollBarP.Parent( C );
@@ -510,7 +510,7 @@ void cEETest::CreateUI() {
 	mScrollBar->Visible( true );
 	mScrollBar->Enabled( true );
 	mScrollBar->AddEventListener( cUIEvent::EventOnValueChange, cb::Make1( this, &cEETest::OnValueChange ) );
-	
+
 	TextParams.PosSet( 20, 5 );
 	mTextBoxValue = eeNew( cUITextBox, ( TextParams ) );
 	mTextBoxValue->Visible( true );