diff --git a/src/audio/mixer.cpp b/src/audio/mixer.cpp
index 21f1ec0b58..6f242f933b 100644
--- a/src/audio/mixer.cpp
+++ b/src/audio/mixer.cpp
@@ -522,7 +522,6 @@ Channel* Mixer::Play(Source& source, int loop, bool deleteondone, bool deletesou
 		newchannel->Play(source, loop);
 		newchannel->deleteondone = deleteondone;
 		newchannel->deletesourceondone = deletesourceondone;
-		newchannel->stopping = false;
 		channels.push_back(newchannel);
 	}
 	Unlock();
@@ -867,8 +866,9 @@ void* Mixer_Play_Music(int pathid, int loop, int streaming)
 			Channel* channel = gMixer.Play(*source_samplestream, loop, false, true);
 			if (!channel) {
 				delete source_samplestream;
+			} else {
+				channel->SetGroup(MIXER_GROUP_MUSIC);
 			}
-			channel->SetGroup(MIXER_GROUP_MUSIC);
 			return channel;
 		} else {
 			delete source_samplestream;
diff --git a/src/interface/screenshot.c b/src/interface/screenshot.c
index 5afda79320..d401ce35b1 100644
--- a/src/interface/screenshot.c
+++ b/src/interface/screenshot.c
@@ -266,7 +266,7 @@ int screenshot_dump_png()
 		lodepng_palette_add(&state.info_raw, r, g, b, a);
 	}
 
-	error = lodepng_encode(&png, &pngSize, dpi->bits, stride, dpi->height, &state);
+	error = lodepng_encode(&png, &pngSize, dpi->bits, width, height, &state);
 	if (error) {
 		log_error("Unable to save screenshot, %u: %s", lodepng_error_text(error));
 		index = -1;