diff --git a/examples/selectAudioDevice.js b/examples/selectAudioDevice.js
index b1da219eb5..c86d034adb 100644
--- a/examples/selectAudioDevice.js
+++ b/examples/selectAudioDevice.js
@@ -120,21 +120,25 @@ function menuItemEvent(menuItem) {
         if (menuItem.endsWith(" for Output")) {
             var selectedDevice = menuItem.trimStartsWith("Use ").trimEndsWith(" for Output");
             print("output audio selection..." + selectedDevice);
+	    Menu.menuItemEvent.disconnect(menuItemEvent);
             Menu.setIsOptionChecked(selectedOutputMenu, false);
             selectedOutputMenu = menuItem;
             Menu.setIsOptionChecked(selectedOutputMenu, true);
             if (AudioDevice.setOutputDevice(selectedDevice)) {
                 Settings.setValue(OUTPUT_DEVICE_SETTING, selectedDevice);
             }
+	    Menu.menuItemEvent.connect(menuItemEvent);
         } else if (menuItem.endsWith(" for Input")) {
             var selectedDevice = menuItem.trimStartsWith("Use ").trimEndsWith(" for Input");
             print("input audio selection..." + selectedDevice);
+	    Menu.menuItemEvent.disconnect(menuItemEvent);
             Menu.setIsOptionChecked(selectedInputMenu, false);
             selectedInputMenu = menuItem;
             Menu.setIsOptionChecked(selectedInputMenu, true);
             if (AudioDevice.setInputDevice(selectedDevice)) {
                 Settings.setValue(INPUT_DEVICE_SETTING, selectedDevice);
             }
+	    Menu.menuItemEvent.connect(menuItemEvent);
         }
     }
 }
diff --git a/libraries/shared/src/PortableHighResolutionClock.cpp b/libraries/shared/src/PortableHighResolutionClock.cpp
index 6e096a7ce1..55dd61707c 100644
--- a/libraries/shared/src/PortableHighResolutionClock.cpp
+++ b/libraries/shared/src/PortableHighResolutionClock.cpp
@@ -24,7 +24,7 @@ namespace {
 win_high_resolution_clock::time_point win_high_resolution_clock::now() {
     LARGE_INTEGER count;
     QueryPerformanceCounter(&count);
-    return time_point(duration(count.QuadPart * static_cast<rep>(period::den) / g_Frequency));
+    return time_point(duration(static_cast<rep>((double) count.QuadPart * (double) period::den / (double)g_Frequency)));
 }
 
 #endif