diff --git a/BasiliskII/src/audio.cpp b/BasiliskII/src/audio.cpp
index 0a8b8ff3..00a89996 100644
--- a/BasiliskII/src/audio.cpp
+++ b/BasiliskII/src/audio.cpp
@@ -39,7 +39,7 @@
 // Supported sample rates, sizes and channels
 vector<uint32> audio_sample_rates;
 vector<uint16> audio_sample_sizes;
-vector<uint16> audio_channel_counts;
+vector<uint8> audio_channel_counts;
 
 // Global variables
 struct audio_status AudioStatus;	// Current audio status (sample rate etc.)
@@ -233,7 +233,7 @@ static int32 AudioSetInfo(uint32 infoPtr, uint32 selector, uint32 sourceID)
 			return badChannel;
 
 		case siSpeakerMute:
-			audio_set_speaker_mute((uint16)infoPtr);
+			audio_set_speaker_mute(uint16(infoPtr) != 0);
 			break;
 
 		case siSpeakerVolume:
@@ -242,7 +242,7 @@ static int32 AudioSetInfo(uint32 infoPtr, uint32 selector, uint32 sourceID)
 			break;
 
 		case siHardwareMute:
-			audio_set_main_mute((uint16)infoPtr);
+			audio_set_main_mute(uint16(infoPtr) != 0);
 			break;
 
 		case siHardwareVolume:
diff --git a/BasiliskII/src/include/audio.h b/BasiliskII/src/include/audio.h
index e8ae480e..b875cc15 100644
--- a/BasiliskII/src/include/audio.h
+++ b/BasiliskII/src/include/audio.h
@@ -76,7 +76,7 @@ extern uint32 audio_component_flags;	// Component feature flags
 
 extern vector<uint32> audio_sample_rates;	// Vector of supported sample rates (16.16 fixed point)
 extern vector<uint16> audio_sample_sizes;	// Vector of supported sample sizes
-extern vector<uint16> audio_channel_counts;	// Array of supported channels counts
+extern vector<uint8> audio_channel_counts;	// Array of supported channels counts
 
 // Audio component global data and 68k routines
 enum {