Updated Makefile for bootstrap