diff --git a/quad/src/computation_graph/computation_graph.c b/quad/src/computation_graph/computation_graph.c
index f20a0d0f50f4824fd41baab7f2adb80a3a8d1960..81ebbf44e5dbdd5e07d039619d26093c4f53ce16 100644
--- a/quad/src/computation_graph/computation_graph.c
+++ b/quad/src/computation_graph/computation_graph.c
@@ -11,9 +11,9 @@ static double exec_input_vals[GRAPH_MAX_INPUTS];
 
 // Macro functions for setting and clearing single bits in int array
 // From http://www.mathcs.emory.edu/~cheung/Courses/255/Syllabus/1-C-intro/bit-array.html
-#define setBit(A,k)     ( A[(k / (8*sizeof(&A)))] |=  (1 << (k % (8*sizeof(&A)))) )
-#define clearBit(A,k)   ( A[(k / (8*sizeof(&A)))] &= ~(1 << (k % (8*sizeof(&A)))) )
-#define testBit(A,k)    ( A[(k / (8*sizeof(&A)))] &   (1 << (k % (8*sizeof(&A)))) )
+#define setBit(A,k)     ( A[(k / (8*sizeof(*A)))] |=  (1 << (k % (8*sizeof(*A)))) )
+#define clearBit(A,k)   ( A[(k / (8*sizeof(*A)))] &= ~(1 << (k % (8*sizeof(*A)))) )
+#define testBit(A,k)    ( A[(k / (8*sizeof(*A)))] &   (1 << (k % (8*sizeof(*A)))) )
 
 struct computation_graph *create_graph() {
     struct computation_graph *the_graph = malloc(sizeof(struct computation_graph));
diff --git a/quad/src/gen_diagram/Makefile b/quad/src/gen_diagram/Makefile
index 302077f0c7aa1fe819be10487b269eb3f478fd8f..d0b152511bb15d8d9f4a10ba851b8c8152bb37a2 100644
--- a/quad/src/gen_diagram/Makefile
+++ b/quad/src/gen_diagram/Makefile
@@ -1,6 +1,7 @@
 TOP=../..
 
 NAME = gen_diagram
-REQLIBS = -lquad_app, -lgraph_blocks, -lcomputation_graph
+REQLIBS = -lquad_app -lgraph_blocks -lcomputation_graph -lm
 
-include $(TOP)/library.mk
\ No newline at end of file
+
+include $(TOP)/executable.mk
\ No newline at end of file
diff --git a/quad/src/gen_diagram/generate.c b/quad/src/gen_diagram/generate.c
index 9b7b323729b2673330350513b2bec89a7142ac6e..3e712a2c04ded92ebc4e3465fcfb5404b466af19 100644
--- a/quad/src/gen_diagram/generate.c
+++ b/quad/src/gen_diagram/generate.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include "computation_graph.h"
 #include "control_algorithm.h"
 
 int main() {