Fixed up make scripts