diff --git a/gstlal-calibration/debian/control.in b/gstlal-calibration/debian/control.in
index ad68e0f0b4f6d6a0e132995788d5b4c03864e35f..d88bb26ba73fd1845dc78fccdbac53426e87a6ce 100644
--- a/gstlal-calibration/debian/control.in
+++ b/gstlal-calibration/debian/control.in
@@ -23,6 +23,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  gir1.2-glib-2.0,
  gir1.2-gstreamer-1.0 (>= @MIN_GSTREAMER_VERSION@),
  gir1.2-gst-plugins-base-1.0 (>= @MIN_GSTREAMER_VERSION@),
+ gst-plugins-math (>= 1.0.1),
  gstlal (>= @MIN_GSTLAL_VERSION@),
  gstlal-ugly (>= @MIN_GSTLALUGLY_VERSION@),
  gstreamer1.0-plugins-base (>= @MIN_GSTREAMER_VERSION@),
@@ -30,7 +31,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  gstreamer1.0-tools (>= @MIN_GSTREAMER_VERSION@),
  lal (>= @MIN_LAL_VERSION@),
  lalmetaio (>= @MIN_LALMETAIO_VERSION@),
- libgirepository-1.0-1 (>= @MIN_GOBJECT_INTROSPECTION_VERSION@),
+ libgirepository-1.0-1,
  libgstreamer1.0-0 (>= @MIN_GSTREAMER_VERSION@),
  libgstreamer-plugins-base1.0-0 (>= @MIN_GSTREAMER_VERSION@),
  python (>= @MIN_PYTHON_VERSION@),
diff --git a/gstlal-calibration/gst/lal/gstlal_smoothkappas.c b/gstlal-calibration/gst/lal/gstlal_smoothkappas.c
index 956966a34c116fb6f41e6cbbd999681eaaa240e4..ca1826bc751a72fa5877784c39015ececc31c645 100644
--- a/gstlal-calibration/gst/lal/gstlal_smoothkappas.c
+++ b/gstlal-calibration/gst/lal/gstlal_smoothkappas.c
@@ -266,7 +266,7 @@ static GstFlowReturn smooth_complex_buffer_ ## DTYPE(const DTYPE complex *src, D
 	double new_element_re, new_element_im; \
 	for(i = 0; i < buffer_size; i++) { \
 		double complex doublesrc = (double complex) *src; \
-		if(gap || creal(doublesrc) > default_kappa_re + maximum_offset_re || creal(doublesrc) < default_kappa_re - maximum_offset_re || isnan(creal(doublesrc)) || isinf(creal(doublesrc) || creal(doublesrc) == 0)) { \
+		if(gap || creal(doublesrc) > default_kappa_re + maximum_offset_re || creal(doublesrc) < default_kappa_re - maximum_offset_re || isnan(creal(doublesrc)) || isinf(creal(doublesrc)) || creal(doublesrc) == 0) { \
 			if(default_to_median) \
 				new_element_re = *current_median_re; \
 			else \
@@ -274,7 +274,7 @@ static GstFlowReturn smooth_complex_buffer_ ## DTYPE(const DTYPE complex *src, D
 		} else { \
 			new_element_re = creal(doublesrc); \
 		} \
-		if(gap || cimag(doublesrc) > default_kappa_im + maximum_offset_im || cimag(doublesrc) < default_kappa_im - maximum_offset_im || isnan(cimag(doublesrc)) || isinf(cimag(doublesrc) || cimag(doublesrc) == 0)) { \
+		if(gap || cimag(doublesrc) > default_kappa_im + maximum_offset_im || cimag(doublesrc) < default_kappa_im - maximum_offset_im || isnan(cimag(doublesrc)) || isinf(cimag(doublesrc)) || cimag(doublesrc) == 0) { \
 			if(default_to_median) \
 				new_element_im = *current_median_im; \
 			else \