diff --git a/Audio/Chain/ConverterNode.m b/Audio/Chain/ConverterNode.m
index 39cd666e4..6ee7c8f8c 100644
--- a/Audio/Chain/ConverterNode.m
+++ b/Audio/Chain/ConverterNode.m
@@ -93,28 +93,24 @@ void scale_by_volume(float *buffer, size_t count, float volume) {
 	// when the end of stream is reached. Convert function instead processes what it can,
 	// and returns 0 samples when it has nothing more to process at the end of stream.
 	while([self shouldContinue] == YES) {
-		AudioChunk *chunk = nil;
 		while(paused) {
 			usleep(500);
 		}
 		@autoreleasepool {
+			AudioChunk *chunk = nil;
 			chunk = [self convert];
-		}
-		if(!chunk) {
-			if([self endOfStream] == YES) {
-				break;
-			}
-			if(paused || !streamFormatChanged) {
-				continue;
-			}
-		} else {
-			@autoreleasepool {
+			if(!chunk) {
+				if([self endOfStream] == YES) {
+					break;
+				}
+				if(paused || !streamFormatChanged) {
+					continue;
+				}
+			} else {
 				[self writeChunk:chunk];
 				chunk = nil;
 			}
-		}
-		if(streamFormatChanged) {
-			@autoreleasepool {
+			if(streamFormatChanged) {
 				[self cleanUp];
 				[self setupWithInputFormat:newInputFormat withInputConfig:newInputChannelConfig outputFormat:self->outputFormat isLossless:rememberedLossless];
 			}
diff --git a/Audio/Output/OutputCoreAudio.m b/Audio/Output/OutputCoreAudio.m
index 94a0b6c59..777bcfada 100644
--- a/Audio/Output/OutputCoreAudio.m
+++ b/Audio/Output/OutputCoreAudio.m
@@ -422,36 +422,38 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 	secondsLatency = 1.0;
 
 	while(!stopping) {
-		if(outputdevicechanged) {
-			[self updateDeviceFormat];
-			outputdevicechanged = NO;
-		}
-
-		if([outputController shouldReset]) {
-			[outputController setShouldReset:NO];
-			[outputLock lock];
-			secondsLatency = 0.0;
-			visPushed = 0.0;
-			started = NO;
-			restarted = NO;
-			if(rsvis) {
-				rsstate_delete(rsvis);
-				rsvis = NULL;
+		@autoreleasepool {
+			if(outputdevicechanged) {
+				[self updateDeviceFormat];
+				outputdevicechanged = NO;
 			}
-			lastClippedSampleRate = 0.0;
-			lastVisRate = 0.0;
-			[outputLock unlock];
-		}
 
-		if(stopping)
-			break;
+			if([outputController shouldReset]) {
+				[outputController setShouldReset:NO];
+				[outputLock lock];
+				secondsLatency = 0.0;
+				visPushed = 0.0;
+				started = NO;
+				restarted = NO;
+				if(rsvis) {
+					rsstate_delete(rsvis);
+					rsvis = NULL;
+				}
+				lastClippedSampleRate = 0.0;
+				lastVisRate = 0.0;
+				[outputLock unlock];
+			}
 
-		if(!started && !paused) {
-			[self resume];
-		}
+			if(stopping)
+				break;
 
-		if([outputController shouldContinue] == NO) {
-			break;
+			if(!started && !paused) {
+				[self resume];
+			}
+
+			if([outputController shouldContinue] == NO) {
+				break;
+			}
 		}
 
 		usleep(5000);
@@ -1037,29 +1039,31 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
 
 		OutputCoreAudio *_self = (__bridge OutputCoreAudio *)refCon;
 		int renderedSamples = 0;
-		
-		while(renderedSamples < frameCount) {
-			int inputRemain = _self->inputRemain;
-			while(!inputRemain) {
-				inputRemain = [_self renderAndConvert];
-				if(_self->stopping)
-					return 0;
-			}
-			if(inputRemain) {
-				int inputTodo = MIN(inputRemain, frameCount - renderedSamples);
-				cblas_scopy(inputTodo * channels, _self->samplePtr, 1, ((float *)inputData->mBuffers[0].mData) + renderedSamples * channels, 1);
-				_self->samplePtr += inputTodo * channels;
-				inputRemain -= inputTodo;
-				renderedSamples += inputTodo;
-			}
-			_self->inputRemain = inputRemain;
-		}
 
-		inputData->mBuffers[0].mDataByteSize = renderedSamples * format->mBytesPerPacket;
-		inputData->mBuffers[0].mNumberChannels = channels;
-		
-		double secondsRendered = (double)renderedSamples / format->mSampleRate;
-		[_self updateLatency:secondsRendered];
+		@autoreleasepool {
+			while(renderedSamples < frameCount) {
+				int inputRemain = _self->inputRemain;
+				while(!inputRemain) {
+					inputRemain = [_self renderAndConvert];
+					if(_self->stopping)
+						return 0;
+				}
+				if(inputRemain) {
+					int inputTodo = MIN(inputRemain, frameCount - renderedSamples);
+					cblas_scopy(inputTodo * channels, _self->samplePtr, 1, ((float *)inputData->mBuffers[0].mData) + renderedSamples * channels, 1);
+					_self->samplePtr += inputTodo * channels;
+					inputRemain -= inputTodo;
+					renderedSamples += inputTodo;
+				}
+				_self->inputRemain = inputRemain;
+			}
+
+			inputData->mBuffers[0].mDataByteSize = renderedSamples * format->mBytesPerPacket;
+			inputData->mBuffers[0].mNumberChannels = channels;
+
+			double secondsRendered = (double)renderedSamples / format->mSampleRate;
+			[_self updateLatency:secondsRendered];
+		}
 
 #ifdef _DEBUG
 		[BadSampleCleaner cleanSamples:(float *)inputData->mBuffers[0].mData