Makefile changes - changes that facilitate it actually working.