diff --git a/Core/HW/SasAudio.cpp b/Core/HW/SasAudio.cpp
index d776d63348..fca3ef62e9 100644
--- a/Core/HW/SasAudio.cpp
+++ b/Core/HW/SasAudio.cpp
@@ -687,14 +687,14 @@ static int getExpCurveAt(int index, int duration) {
 
 ADSREnvelope::ADSREnvelope()
 	: 	attackRate(0),
-		attackType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_INCREASE),
 		decayRate(0),
-		decayType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_DECREASE),
 		sustainRate(0),
-		sustainType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_INCREASE),
 		releaseRate(0),
-		releaseType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_DECREASE),
+		attackType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_INCREASE),
+		decayType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_DECREASE),
+		sustainType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_INCREASE),
 		sustainLevel(0x100),
+		releaseType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_DECREASE),
 		state_(STATE_OFF),
 		steps_(0),
 		height_(0) {
diff --git a/GPU/GLES/ShaderManager.cpp b/GPU/GLES/ShaderManager.cpp
index 6968798ba1..8390ca169f 100644
--- a/GPU/GLES/ShaderManager.cpp
+++ b/GPU/GLES/ShaderManager.cpp
@@ -71,7 +71,7 @@ Shader::~Shader() {
 }
 
 LinkedShader::LinkedShader(Shader *vs, Shader *fs, bool useHWTransform)
-		: program(0), dirtyUniforms(0), useHWTransform_(useHWTransform) {
+		: useHWTransform_(useHWTransform), program(0), dirtyUniforms(0) {
 	program = glCreateProgram();
 	glAttachShader(program, vs->shader);
 	glAttachShader(program, fs->shader);
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index d99ab0d92a..ea69222f83 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -181,7 +181,7 @@ void PathBrowser::Navigate(const std::string &path) {
 		if (path_.size() == 3 && path_[1] == ':') {
 			path_ = "/";
 		} else {
-			int slash = path_.rfind('/', path_.size() - 2);
+			size_t slash = path_.rfind('/', path_.size() - 2);
 			if (slash != std::string::npos)
 				path_ = path_.substr(0, slash + 1);
 		}
@@ -212,9 +212,8 @@ private:
 	UI::EventReturn GameButtonClick(UI::EventParams &e);
 	UI::EventReturn NavigateClick(UI::EventParams &e);
 
-
-	bool allowBrowsing_;
 	PathBrowser path_;
+	bool allowBrowsing_;
 };
 
 GameBrowser::GameBrowser(std::string path, bool allowBrowsing, UI::LayoutParams *layoutParams)