diff --git a/OSBindings/Mac/Clock Signal/Audio/CSAudioQueue.m b/OSBindings/Mac/Clock Signal/Audio/CSAudioQueue.m
index 267ecee96..47507b332 100644
--- a/OSBindings/Mac/Clock Signal/Audio/CSAudioQueue.m	
+++ b/OSBindings/Mac/Clock Signal/Audio/CSAudioQueue.m	
@@ -174,9 +174,8 @@ static void audioOutputCallback(
 
 - (void)enqueueAudioBuffer:(const int16_t *)buffer numberOfSamples:(size_t)lengthInSamples
 {
-	while(1)
+	if([_writeLock tryLockWhenCondition:AudioQueueCanProceed])
 	{
-		[_writeLock lockWhenCondition:AudioQueueCanProceed];
 		if((_audioStreamReadPosition + _streamLength) - _audioStreamWritePosition >= lengthInSamples)
 		{
 			size_t samplesBeforeOverflow = _streamLength - (_audioStreamWritePosition % _streamLength);
@@ -193,7 +192,6 @@ static void audioOutputCallback(
 
 			_audioStreamWritePosition += lengthInSamples;
 			[_writeLock unlockWithCondition:[self writeLockCondition]];
-			break;
 		}
 		else
 		{
diff --git a/OSBindings/Mac/Clock Signal/Documents/Vic20Document.swift b/OSBindings/Mac/Clock Signal/Documents/Vic20Document.swift
index ed113cc29..b55a42427 100644
--- a/OSBindings/Mac/Clock Signal/Documents/Vic20Document.swift	
+++ b/OSBindings/Mac/Clock Signal/Documents/Vic20Document.swift	
@@ -157,7 +157,7 @@ class Vic20Document: MachineDocument {
 		standardUserDefaults.registerDefaults([
 			self.autoloadingUserDefaultsKey: true,
 			self.memorySizeUserDefaultsKey: 5,
-			self.countryUserDefaultsKey: 4
+			self.countryUserDefaultsKey: 1
 		])
 
 		let loadAutomatically = standardUserDefaults.boolForKey(self.autoloadingUserDefaultsKey)