Makefile
Resolved Makefile issues