some changes to work with the new simplified Makefile