Added inc and lib support to fixed jobs, adjustment to bootdrivers