diff --git a/photobooth.py b/photobooth.py
index d71b66c..0fb619e 100755
--- a/photobooth.py
+++ b/photobooth.py
@@ -10,8 +10,8 @@ from time import sleep, clock
 from PIL import Image
 
 from gui import GUI_PyGame as GuiModule
-from camera import CameraException, Camera_cv as CameraModule
-#from camera import CameraException, Camera_gPhoto as CameraModule
+# from camera import CameraException, Camera_cv as CameraModule
+from camera import CameraException, Camera_gPhoto as CameraModule
 from slideshow import Slideshow
 from events import Rpi_GPIO as GPIO
 
diff --git a/set-time.py b/set-time.py
index 4b40306..76e0bae 100755
--- a/set-time.py
+++ b/set-time.py
@@ -65,8 +65,10 @@ def main():
 
 		digit_done = False
 		while not digit_done:
-			event = display.wait_for_event()
-			digit_done = handle_event(event, digit, date_digits, numpad)
+			r, e = display.check_for_event()
+			while r:
+				digit_done = handle_event(e, digit, date_digits, numpad)
+				r, e = display.check_for_event()
 
 	for digit in range(len(time_digits)):
 		display.clear()