diff --git a/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp b/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
index c2bfc91c3d..0be753f3fc 100644
--- a/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
+++ b/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
@@ -1246,7 +1246,7 @@ AudioMixer::HandleEvent( const media_timed_event *event, bigtime_t lateness,
 					
 				// calculate the start time for the next event
 					
-				fNextEventTime = fStartTime + (double(fFramesSent / fOutput.format.u.raw_audio.frame_rate) * 1000000.0);
+				fNextEventTime = bigtime_t(fStartTime + double(fFramesSent / fOutput.format.u.raw_audio.frame_rate) * 1000000.0);
 					
 				media_timed_event nextBufferEvent(fNextEventTime, BTimedEventQueue::B_HANDLE_BUFFER);
 				EventQueue()->AddEvent(nextBufferEvent);
diff --git a/src/add-ons/media/media-add-ons/mixer/AudioMixer.h b/src/add-ons/media/media-add-ons/mixer/AudioMixer.h
index 6b57f642b1..941fa4a5ea 100644
--- a/src/add-ons/media/media-add-ons/mixer/AudioMixer.h
+++ b/src/add-ons/media/media-add-ons/mixer/AudioMixer.h
@@ -214,4 +214,4 @@ class AudioMixer :
 		
 };		
 			
-#endif
\ No newline at end of file
+#endif
diff --git a/src/add-ons/media/media-add-ons/mixer/FillMixBuffer.cpp b/src/add-ons/media/media-add-ons/mixer/FillMixBuffer.cpp
index 3b521e5385..fd2e77bb25 100644
--- a/src/add-ons/media/media-add-ons/mixer/FillMixBuffer.cpp
+++ b/src/add-ons/media/media-add-ons/mixer/FillMixBuffer.cpp
@@ -258,7 +258,7 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
 										{
 											int sample = frameStart + chan;
 					
-											int inputValue = (32767 * indata[inputSample] * channel->fGainScale[chan]) + outdata[sample];
+											int inputValue = int((32767 * indata[inputSample] * channel->fGainScale[chan]) + outdata[sample]);
 																							
 											if (inputValue > 32767)
 												clipoffset[sample] = clipoffset[sample] + 1;
@@ -311,7 +311,7 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
 										{
 											int sample = frameStart + chan;
 					
-											int clipTest = (outdata[sample] + (indata[inputSample] * channel->fGainScale[chan]));
+											int clipTest = int(outdata[sample] + (indata[inputSample] * channel->fGainScale[chan]));
 																						
 											if (clipTest > 32767)
 												clipoffset[sample] = clipoffset[sample] + 1;
@@ -430,7 +430,7 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
 				{
 					int sample = frameStart + channel;
 					
-					int scaledSample = (outdata[sample] + (65536 * clipoffset[sample])) * fMasterGainScale[channel];
+					int scaledSample = int((outdata[sample] + (65536 * clipoffset[sample])) * fMasterGainScale[channel]);
 					
 					if (scaledSample < -32768)
 						outdata[sample] = -32768;
@@ -449,4 +449,4 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
 
 	return B_OK;
 
-}
\ No newline at end of file
+}
diff --git a/src/add-ons/media/media-add-ons/mixer/IOStructures.h b/src/add-ons/media/media-add-ons/mixer/IOStructures.h
index 5514d536e2..627bb00f0d 100644
--- a/src/add-ons/media/media-add-ons/mixer/IOStructures.h
+++ b/src/add-ons/media/media-add-ons/mixer/IOStructures.h
@@ -40,4 +40,4 @@ class mixer_input
 		
 };
 
-#endif;
\ No newline at end of file
+#endif
diff --git a/src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp b/src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp
index 0f526da90d..4e12365a77 100644
--- a/src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp
+++ b/src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp
@@ -81,4 +81,4 @@ status_t AudioMixerAddon::GetConfigurationFor(
 	return B_ERROR;
 }
 
-// end
\ No newline at end of file
+// end