diff --git a/src/lyrics.cpp b/src/lyrics.cpp
index 248d4f4e..8a78de55 100644
--- a/src/lyrics.cpp
+++ b/src/lyrics.cpp
@@ -18,7 +18,6 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#include <atomic>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/range/algorithm_ext/erase.hpp>
diff --git a/src/lyrics.h b/src/lyrics.h
index b007acf8..d91fd467 100644
--- a/src/lyrics.h
+++ b/src/lyrics.h
@@ -21,6 +21,7 @@
 #ifndef NCMPCPP_LYRICS_H
 #define NCMPCPP_LYRICS_H
 
+#include <atomic>
 #include <boost/optional.hpp>
 #include <boost/thread/future.hpp>
 #include <memory>
diff --git a/src/regex_filter.h b/src/regex_filter.h
index c0b49a4c..398b0e05 100644
--- a/src/regex_filter.h
+++ b/src/regex_filter.h
@@ -82,11 +82,11 @@ struct Filter
 	Filter() { }
 
 	template <typename FilterT>
-	Filter(const std::string &constraint,
+	Filter(const std::string &constraint_,
 	       boost::regex_constants::syntax_option_type flags,
 	       FilterT &&filter)
-		: m_rx(make(constraint, flags))
-		, m_constraint(constraint)
+		: m_rx(make(constraint_, flags))
+		, m_constraint(constraint_)
 		, m_filter(std::forward<FilterT>(filter))
 	{ }
 
@@ -124,11 +124,11 @@ template <typename T> struct ItemFilter
 	ItemFilter() { }
 
 	template <typename FilterT>
-	ItemFilter(const std::string &constraint,
+	ItemFilter(const std::string &constraint_,
 	           boost::regex_constants::syntax_option_type flags,
 	           FilterT &&filter)
-		: m_rx(make(constraint, flags))
-		, m_constraint(constraint)
+		: m_rx(make(constraint_, flags))
+		, m_constraint(constraint_)
 		, m_filter(std::forward<FilterT>(filter))
 	{ }
 	
diff --git a/src/visualizer.cpp b/src/visualizer.cpp
index 093faeea..4871d47d 100644
--- a/src/visualizer.cpp
+++ b/src/visualizer.cpp
@@ -109,7 +109,7 @@ void Visualizer::update()
 	// PCM in format 44100:16:1 (for mono visualization) and
 	// 44100:16:2 (for stereo visualization) is supported.
 	int16_t buf[m_samples];
-	ssize_t data = read(m_fifo, buf, sizeof(buf));
+	ssize_t data = read(m_fifo, buf, sizeof(int16_t) * m_samples);
 	if (data < 0) // no data available in fifo
 		return;