Makefile improvments