Small changes to Makefile and test-chill