Small changes in Makefile and code