Fixes for compiling (didn't compile before)
With top level makefile. Compiles and runs without TRACING active