Finial fixes in makefile