diff --git a/RetroFE/Source/Collection/CollectionInfoBuilder.h b/RetroFE/Source/Collection/CollectionInfoBuilder.h
index d368bef..cff4809 100644
--- a/RetroFE/Source/Collection/CollectionInfoBuilder.h
+++ b/RetroFE/Source/Collection/CollectionInfoBuilder.h
@@ -32,8 +32,8 @@ public:
     CollectionInfo *BuildCollection(std::string collectionName);
 
 private:
+    Configuration &Conf;
     MetadataDatabase &MetaDB;
     bool ImportBasicList(CollectionInfo *info, std::string file, std::map<std::string, Item *> &list);
     bool ImportDirectory(CollectionInfo *info);
-    Configuration &Conf;
 };
diff --git a/RetroFE/Source/Database/DB.h b/RetroFE/Source/Database/DB.h
index 842c904..aa2a707 100644
--- a/RetroFE/Source/Database/DB.h
+++ b/RetroFE/Source/Database/DB.h
@@ -30,7 +30,7 @@ public:
     }
 
 private:
-    sqlite3 *Handle;
     std::string Path;
+    sqlite3 *Handle;
 };
 
diff --git a/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp b/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp
index d90840c..0cf6e28 100644
--- a/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp
+++ b/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp
@@ -33,11 +33,12 @@ ReloadableMedia::ReloadableMedia(Configuration &config, std::string type, bool i
     , LoadedComponent(NULL)
     , ReloadRequested(false)
     , FirstLoad(true)
-    , Type(type)
+    , VideoInst(NULL)
     , IsVideo(isVideo)
     , FontInst(font)
     , FontColor(fontColor)
     , TextFallback(false)
+    , Type(type)
     , ScaleX(scaleX)
     , ScaleY(scaleY)
 {
diff --git a/RetroFE/Source/Graphics/Component/ScrollingList.cpp b/RetroFE/Source/Graphics/Component/ScrollingList.cpp
index c6d112d..3efd26c 100644
--- a/RetroFE/Source/Graphics/Component/ScrollingList.cpp
+++ b/RetroFE/Source/Graphics/Component/ScrollingList.cpp
@@ -49,6 +49,7 @@ ScrollingList::ScrollingList(Configuration &c,
     , ScrollPoints(NULL)
     , TweenPoints(NULL)
     , TweenEnterTime(0)
+    , Focus(false)
     , FirstSpriteIndex(0)
     , SelectedSpriteListIndex(0)
     , ScrollStopRequested(true)
@@ -66,7 +67,6 @@ ScrollingList::ScrollingList(Configuration &c,
     , FontColor(fontColor)
     , LayoutKey(layoutKey)
     , ImageType(imageType)
-    , Focus(false)
 {
 }
 
@@ -74,6 +74,7 @@ ScrollingList::ScrollingList(const ScrollingList &copy)
     : Component(copy)
     , SpriteList(NULL)
     , TweenEnterTime(0)
+    , Focus(false)
     , FirstSpriteIndex(0)
     , SelectedSpriteListIndex(0)
     , ScrollStopRequested(true)
@@ -91,7 +92,6 @@ ScrollingList::ScrollingList(const ScrollingList &copy)
     , FontColor(copy.FontColor)
     , LayoutKey(copy.LayoutKey)
     , ImageType(copy.ImageType)
-    , Focus(false)
 {
 
     ScrollPoints = NULL;
@@ -467,7 +467,6 @@ void ScrollingList::TriggerMenuExitEvent()
 
 void ScrollingList::Update(float dt)
 {
-    bool initializePoints = false;
     Component::Update(dt);
 
     if(!ScrollPoints)
@@ -512,7 +511,6 @@ void ScrollingList::Update(float dt)
         // check to see if requested to scroll
         if(RequestedScrollDirection != ScrollDirectionIdle)
         {
-            initializePoints = true;
             CurrentScrollState = ScrollStateActive;
             CurrentScrollDirection = RequestedScrollDirection;
             scrollRequested = true;