More make file  changes