Reordering installs to fix homedir issues