diff --git a/include/eepp/ui/uidragablecontrol.hpp b/include/eepp/ui/uidragablecontrol.hpp
index 5a6325ef3..c7b042447 100644
--- a/include/eepp/ui/uidragablecontrol.hpp
+++ b/include/eepp/ui/uidragablecontrol.hpp
@@ -44,9 +44,9 @@ class EE_API UIDragableControl : public UIControl {
 
 		virtual Uint32 onDrag( const Vector2i& position );
 
-		virtual Uint32 OnDragStart( const Vector2i& position );
+		virtual Uint32 onDragStart( const Vector2i& position );
 
-		virtual Uint32 OnDragEnd( const Vector2i& position );
+		virtual Uint32 onDragEnd( const Vector2i& position );
 };
 
 }}
diff --git a/src/eepp/graphics/renderer/clippingmask.cpp b/src/eepp/graphics/renderer/clippingmask.cpp
index ccd64c5dc..506a52abd 100644
--- a/src/eepp/graphics/renderer/clippingmask.cpp
+++ b/src/eepp/graphics/renderer/clippingmask.cpp
@@ -32,7 +32,7 @@ void ClippingMask::clipEnable( const Int32& x, const Int32& y, const Int32& Widt
 void ClippingMask::clipDisable() {
 	GlobalBatchRenderer::instance()->draw();
 
-	if ( ! mScissorsClipped.empty() ) { // This should always be true
+	if ( !mScissorsClipped.empty() ) { // This should always be true
 		mScissorsClipped.pop_back();
 	}
 
@@ -82,6 +82,7 @@ void ClippingMask::clipPlaneDisable() {
 
 ClippingMask::ClippingMask() :
 	mPushScissorClip( true ),
+	mPushClip( true ),
 	mMode( Inclusive )
 {
 }
diff --git a/src/eepp/ui/uidragablecontrol.cpp b/src/eepp/ui/uidragablecontrol.cpp
index dabfb51ea..e6c4c537b 100644
--- a/src/eepp/ui/uidragablecontrol.cpp
+++ b/src/eepp/ui/uidragablecontrol.cpp
@@ -91,11 +91,11 @@ Uint32 UIDragableControl::onDrag( const Vector2i& Pos ) {
 	return 1;
 }
 
-Uint32 UIDragableControl::OnDragStart( const Vector2i& Pos ) {
+Uint32 UIDragableControl::onDragStart( const Vector2i& Pos ) {
 	return 1;
 }
 
-Uint32 UIDragableControl::OnDragEnd( const Vector2i& Pos ) {
+Uint32 UIDragableControl::onDragEnd( const Vector2i& Pos ) {
 	return 1;
 }
 
@@ -118,12 +118,12 @@ void UIDragableControl::setDragging( const bool& dragging ) {
 		UIMessage tMsg( this, UIMessage::MsgDragStart, 0 );
 		messagePost( &tMsg );
 
-		OnDragStart( UIManager::instance()->getMousePos() );
+		onDragStart( UIManager::instance()->getMousePos() );
 	} else {
 		UIMessage tMsg( this, UIMessage::MsgDragEnd, 0 );
 		messagePost( &tMsg );
 
-		OnDragEnd( UIManager::instance()->getMousePos() );
+		onDragEnd( UIManager::instance()->getMousePos() );
 	}
 }
 
diff --git a/src/eepp/ui/uitouchdragablewidget.cpp b/src/eepp/ui/uitouchdragablewidget.cpp
index 4cb3442d8..10cd0f9b7 100644
--- a/src/eepp/ui/uitouchdragablewidget.cpp
+++ b/src/eepp/ui/uitouchdragablewidget.cpp
@@ -71,7 +71,6 @@ void UITouchDragableWidget::update() {
 
 					onTouchDragValueChange( diff );
 
-
 					mTouchDragAcceleration += elapsed * diff * mTouchDragDeceleration;
 
 					mTouchDragPoint = Pos;