Some necessary path changes