Fix issues with makefile