Small corrections to makefiles. Now compiles with TRACEing enabled.