diff --git a/src/zm_camera.cpp b/src/zm_camera.cpp
index cd69240c2..43e97f26a 100644
--- a/src/zm_camera.cpp
+++ b/src/zm_camera.cpp
@@ -20,7 +20,6 @@
 #include "zm.h"
 #include "zm_camera.h"
 
-<<<<<<< HEAD
 Camera::Camera(
     unsigned int p_monitor_id,
     SourceType p_type,
@@ -52,7 +51,6 @@ Camera::Camera(
     mVideoCodecContext(NULL),
     mAudioCodecContext(NULL),
     video_stream(NULL),
-    record_audio(p_record_audio),
     bytes(0)
 {
   pixels = width * height;
diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index d9ba31752..f80e0b9d9 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -203,7 +203,7 @@ Event::Event(
       }
     }
         
-    snprintf(video_name, sizeof(video_name), "%llu-%s.%s", id, "video", container.c_str());
+    snprintf(video_name, sizeof(video_name), "%" PRIu64 "-%s.%s", id, "video", container.c_str());
     snprintf(video_file, sizeof(video_file), staticConfig.video_file_format, path.c_str(), video_name);
     Debug(1,"Writing video file to %s", video_file);
     Camera * camera = monitor->getCamera();
diff --git a/src/zmc.cpp b/src/zmc.cpp
index 22c8a809e..cf0f678b5 100644
--- a/src/zmc.cpp
+++ b/src/zmc.cpp
@@ -267,7 +267,6 @@ int main(int argc, char *argv[]) {
     AnalysisThread **analysis_threads = new AnalysisThread *[n_monitors];
     int *capture_delays = new int[n_monitors];
     int *alarm_capture_delays = new int[n_monitors];
-    int *next_delays = new int[n_monitors];
     struct timeval * last_capture_times = new struct timeval[n_monitors];
     for ( int i = 0; i < n_monitors; i++ ) {
       last_capture_times[i].tv_sec = last_capture_times[i].tv_usec = 0;