diff --git a/build.sh b/build.sh
index 8afadce..5dda1c8 100755
--- a/build.sh
+++ b/build.sh
@@ -15,9 +15,9 @@ LDFLAGS='-lircclient -lsqlite3'
 mkdir -p $PREFIX && echo "Made directory: $PREFIX"
 
 # Bourne shell is evil
-if [ ${DEBUG} -eq 1 ]
+if [ ${DEBUG-0} -eq 1 ]
 then
-  CFLAGS=`echo "${CFLAGS} -Og -g3"`
+  CFLAGS=`echo "${CFLAGS} -Og -ggdb"`
 else
   CPPFLAGS="${CPPFLAGS} -DNDEBUG"
   CFLAGS=`echo "${CFLAGS} -O2 -flto=auto -fomit-frame-pointer -s"`
diff --git a/src/parse.c b/src/parse.c
index be7c105..09b21a3 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -24,7 +24,7 @@
 #include "parse.h"
 #include "error.h"
 
-#define PARAMS_COUNT 2
+#define PARAMS_COUNT 5
 
 creds_t creds = {0};