diff --git a/ultragrid/src/audio/audio.c b/ultragrid/src/audio/audio.c
index d2d4911b7..6dbcd14c3 100644
--- a/ultragrid/src/audio/audio.c
+++ b/ultragrid/src/audio/audio.c
@@ -129,7 +129,7 @@ int audio_init(int output_device, int input_device)
 	if(input_device != -2)
 	{
 		inputParameters.channelCount = 1;
-		inputParameters.sampleFormat = paInt24;
+		inputParameters.sampleFormat = paInt16;
 		if(!interleaved)
 			inputParameters.sampleFormat |= paNonInterleaved;
 
@@ -141,7 +141,7 @@ int audio_init(int output_device, int input_device)
 	if(output_device != -2)
 	{
 		outputParameters.channelCount = 1;	// output channels
-		outputParameters.sampleFormat = paInt24;
+		outputParameters.sampleFormat = paInt16;
 		if(!interleaved)
 			outputParameters.sampleFormat |= paNonInterleaved;
 		outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultHighOutputLatency;
diff --git a/ultragrid/src/video_capture/decklink.cpp b/ultragrid/src/video_capture/decklink.cpp
index e3b003fca..f79934b13 100644
--- a/ultragrid/src/video_capture/decklink.cpp
+++ b/ultragrid/src/video_capture/decklink.cpp
@@ -220,6 +220,9 @@ decklink_help()
 	IDeckLink*			deckLink;
 	int				numDevices = 0;
 	HRESULT				result;
+
+	printf("Decklink options:\n");
+	printf("\tdevice:mode\n");
 	
 	// Create an IDeckLinkIterator object to enumerate all DeckLink cards in the system
 	deckLinkIterator = CreateDeckLinkIteratorInstance();
@@ -234,8 +237,6 @@ decklink_help()
 	{
 		char *		deviceNameString = NULL;
 		
-		// Increment the total number of DeckLink cards found
-		numDevices++;
 		
 		// *** Print the model name of the DeckLink card
 		result = deckLink->GetModelName((const char **) &deviceNameString);
@@ -245,6 +246,9 @@ decklink_help()
 			free(deviceNameString);
 		}
 		
+		// Increment the total number of DeckLink cards found
+		numDevices++;
+	
 		// ** List the video output display modes supported by the card
 		print_output_modes(deckLink);