Adjust order of install tasks