diff --git a/mbuni/configure.ac b/mbuni/configure.ac
index 55d0c1a..1588c72 100644
--- a/mbuni/configure.ac
+++ b/mbuni/configure.ac
@@ -100,10 +100,10 @@ LIBS="$LIBS $withval")
 
 dnl Check for large file handling
 AC_SYS_LARGEFILE(CFLAGS)
-if test ${ac_cv_sys_file_offset_bits} != no ; then
+if test "${ac_cv_sys_file_offset_bits}" != no ; then
     CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=${ac_cv_sys_file_offset_bits}"
 fi
-if test ${ac_cv_sys_large_files} != "no" ; then
+if test "${ac_cv_sys_large_files}" != "no" ; then
     CFLAGS="$CFLAGS -D_LARGE_FILES=${ac_cv_sys_large_files}"
 fi
 
diff --git a/mbuni/mmsc/mmsmobilesender.c b/mbuni/mmsc/mmsmobilesender.c
index 478c7e2..7536c28 100644
--- a/mbuni/mmsc/mmsmobilesender.c
+++ b/mbuni/mmsc/mmsmobilesender.c
@@ -145,9 +145,9 @@ static void start_push(Octstr *rcpt_to, int isphonenum, MmsEnvelope *e, MmsMsg *
 	       settings->qfs->mms_queue_free_env(e);
      }
  done:
-     if (to) octstr_destroy(to);
-     if (pduhdr) octstr_destroy(pduhdr);
-     if (s) octstr_destroy(s);
+     octstr_destroy(to);
+     octstr_destroy(pduhdr);
+     octstr_destroy(s);
 }