diff --git a/src/modules/audio/openal/Audio.h b/src/modules/audio/openal/Audio.h
index 54f006777..9d9badb07 100644
--- a/src/modules/audio/openal/Audio.h
+++ b/src/modules/audio/openal/Audio.h
@@ -137,12 +137,12 @@ private:
 	ALCcontext *context;
 
 	// The OpenAL effects
-	struct effectmapStorage
+	struct EffectMapStorage
 	{
 		Effect *effect;
 		ALuint slot;
 	};
-	std::map<std::string, struct effectmapStorage> effectmap;
+	std::map<std::string, struct EffectMapStorage> effectmap;
 	std::stack<ALuint> slotlist;
 	int MAX_SCENE_EFFECTS = 64;
 	int MAX_SOURCE_EFFECTS = 64;
diff --git a/src/modules/audio/openal/Source.cpp b/src/modules/audio/openal/Source.cpp
index a0461b491..1bd92ff9d 100644
--- a/src/modules/audio/openal/Source.cpp
+++ b/src/modules/audio/openal/Source.cpp
@@ -392,7 +392,7 @@ bool Source::update()
 			if (!isFinished())
 			{
 				ALint processed;
-				ALuint buffers[this->buffers];
+				ALuint buffers[MAX_BUFFERS];
 				float curOffsetSamples, curOffsetSecs, newOffsetSamples, newOffsetSecs;
 				int freq = decoder->getSampleRate();
 
diff --git a/src/modules/audio/openal/Source.h b/src/modules/audio/openal/Source.h
index 0f47e67bf..2e6f1cd39 100644
--- a/src/modules/audio/openal/Source.h
+++ b/src/modules/audio/openal/Source.h
@@ -228,12 +228,12 @@ private:
 
 	Filter *directfilter = nullptr;
 
-	struct effectmapStorage
+	struct EffectMapStorage
 	{
 		Filter *filter;
 		ALuint slot, target;
 	};
-	std::map<std::string, struct effectmapStorage> effectmap;
+	std::map<std::string, struct EffectMapStorage> effectmap;
 	std::stack<ALuint> slotlist;
 }; // Source