Minor changes to build with makefile