diff --git a/qpms/CMakeLists.txt b/qpms/CMakeLists.txt
index 6154a69..3dffad0 100644
--- a/qpms/CMakeLists.txt
+++ b/qpms/CMakeLists.txt
@@ -26,6 +26,8 @@ target_link_libraries (qpms
 	)
 target_include_directories (qpms PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
+target_compile_options(qpms PRIVATE -Wall -Wno-return-type)
+
 install(TARGETS qpms
 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/qpms/lattices.h b/qpms/lattices.h
index f738ff3..1798e93 100644
--- a/qpms/lattices.h
+++ b/qpms/lattices.h
@@ -333,7 +333,7 @@ static inline PGenReturnDataBulk PGen_fetch_any(struct PGen *g, size_t nmemb,
 			if (res1.flags & PGEN_NOTDONE) {
 				target[res.generated] = res1.point;
 				// The coordinate system generated by next() must be consistent:
-				assert(!res.generated || (res1.flags & PGEN_COORDS_BITRANGE == res.flags & PGEN_COORDS_BITRANGE));
+				assert(!res.generated || ((res1.flags & PGEN_COORDS_BITRANGE) == (res.flags & PGEN_COORDS_BITRANGE)));
 				res.flags |= res1.flags & PGEN_COORDS_BITRANGE;
 			} else {
 				res.flags &= ~PGEN_NOTDONE;
diff --git a/qpms/tmatrices.h b/qpms/tmatrices.h
index 3178c3c..c208aa0 100644
--- a/qpms/tmatrices.h
+++ b/qpms/tmatrices.h
@@ -1,4 +1,4 @@
-/* \file tmatrices.h
+/*! \file tmatrices.h
  * \brief T-matrices for scattering systems.
  */
 #ifndef TMATRICES_H
@@ -371,8 +371,7 @@ static inline qpms_tmatrix_t *qpms_tmatrix_spherical(
 	return t;
 }
 
-/// Convenience function to calculate T-matrix of a non-magnetic spherical \
-particle using the permittivity values, replacing existing T-matrix data.
+/// Convenience function to calculate T-matrix of a non-magnetic spherical particle using the permittivity values, replacing existing T-matrix data.
 qpms_errno_t qpms_tmatrix_spherical_mu0_fill(
 		qpms_tmatrix_t *t, ///< T-matrix whose contents are to be replaced. Not NULL.
 		double a, ///< Radius of the sphere.
diff --git a/qpms/vectors.h b/qpms/vectors.h
index 45b201f..47c35d6 100644
--- a/qpms/vectors.h
+++ b/qpms/vectors.h
@@ -530,7 +530,7 @@ static inline cart2_t anycoord2cart2(anycoord_point_t p, qpms_coord_system_t t)
 /** See @ref coord_conversions for the conversion definitions.
  */ 
 static inline double anycoord2cart1(anycoord_point_t p, qpms_coord_system_t t) {
-	if (t & QPMS_COORDS_BITRANGE == QPMS_COORDS_CART1) 
+	if ((t & QPMS_COORDS_BITRANGE) == QPMS_COORDS_CART1) 
 			return p.z;
 	else
 		QPMS_PR_ERROR("Implicit conversion from nD (n > 1)"