Makefile corrections for build issue