Updates for Makefile