Accomodate new make paths / executable names