Fix Makefiles

Update Makefiles