diff --git a/configure.ac b/configure.ac
index 560018663..e5f5b23dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -503,6 +503,8 @@ case "$host_os" in
         ;;
 esac
 
+LIBS="$LIBS $X_LIBS"
+
 AC_SUBST(X_CFLAGS)
 AC_SUBST(X_LIBS)
 AC_SUBST(X_EXTRA_LIBS)
diff --git a/src/audio/capture/coreaudio.c b/src/audio/capture/coreaudio.c
index 46231a8c3..a61e7a0e6 100644
--- a/src/audio/capture/coreaudio.c
+++ b/src/audio/capture/coreaudio.c
@@ -226,7 +226,7 @@ error:
         fprintf(stderr, "[CoreAudio] error obtaining device list.\n");
 }
 
-static void * audio_cap_ca_init(char *cfg)
+static void * audio_cap_ca_init(const char *cfg)
 {
         if(cfg && strcmp(cfg, "help") == 0) {
                 printf("Available Core Audio capture devices:\n");
diff --git a/src/rtsp/BasicRTSPOnlySubsession.hh b/src/rtsp/BasicRTSPOnlySubsession.hh
index 8de3deaca..edf9d99be 100644
--- a/src/rtsp/BasicRTSPOnlySubsession.hh
+++ b/src/rtsp/BasicRTSPOnlySubsession.hh
@@ -129,8 +129,8 @@ private:
 
     void setSDPLines();
 
-    Boolean fReuseFirstSource __attribute__((unused));
-    void* fLastStreamToken __attribute__((unused));
+    Boolean fReuseFirstSource;
+    void* fLastStreamToken;
     char fCNAME[100];
     struct module *fmod;
     rtps_types_t avType;
diff --git a/src/video_rxtx/ultragrid_rtp.cpp b/src/video_rxtx/ultragrid_rtp.cpp
index 2972c9ccc..b45493eb3 100644
--- a/src/video_rxtx/ultragrid_rtp.cpp
+++ b/src/video_rxtx/ultragrid_rtp.cpp
@@ -219,7 +219,6 @@ after_send:
                 " sendBytesTotal " << m_send_bytes_total <<
                 " timestamp " << now <<
                 " compressMillis " << tx_frame->compress_end - tx_frame->compress_start;
-        ///@todo Add more accurate statistics in milliseconds
         control_report_stats(m_control, oss.str());
 }