diff --git a/src/Config.cpp b/src/Config.cpp
index 38dcbe2ad..d2a84e3a0 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -86,7 +86,7 @@ void Config::createDefault (const std::string& file)
     if (taskDir != "")
     {
       FILE* out;
-      if (out = fopen (file.c_str (), "w"))
+      if ((out = fopen (file.c_str (), "w")))
       {
         fprintf (out, "data.location=%s\n", taskDir.c_str ());
         fprintf (out, "command.logging=off\n");
diff --git a/src/Grid.cpp b/src/Grid.cpp
index 756da8c45..3fa601a77 100644
--- a/src/Grid.cpp
+++ b/src/Grid.cpp
@@ -399,6 +399,8 @@ bool Grid::Cell::operator== (const Grid::Cell& rhs) const
   case CELL_STRING: return mString == rhs.mString ? true : false;
   default:          break; // To prevent warnings.
   }
+
+  return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -414,6 +416,8 @@ bool Grid::Cell::operator!= (const Grid::Cell& rhs) const
   case CELL_STRING: return mString != rhs.mString ? true : false;
   default:          break; // To prevent warnings.
   }
+
+  return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/Makefile.am b/src/Makefile.am
index 247011973..f71e12ff4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,2 +1,3 @@
 bin_PROGRAMS = task
 task_SOURCES = Config.cpp Date.cpp T.cpp TDB.cpp Table.cpp Grid.cpp color.cpp parse.cpp task.cpp util.cpp text.cpp rules.cpp Config.h Date.h T.h TDB.h Table.h Grid.h color.h stlmacros.h task.h
+AM_CPPFLAGS = -Wall -pedantic -ggdb3 -fno-rtti
diff --git a/src/Makefile.in b/src/Makefile.in
index 8d215b3b4..c7f6c6845 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -155,6 +155,7 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 task_SOURCES = Config.cpp Date.cpp T.cpp TDB.cpp Table.cpp Grid.cpp color.cpp parse.cpp task.cpp util.cpp text.cpp rules.cpp Config.h Date.h T.h TDB.h Table.h Grid.h color.h stlmacros.h task.h
+AM_CPPFLAGS = -Wall -pedantic -ggdb3 -fno-rtti
 all: all-am
 
 .SUFFIXES: