Fix a few dependency issues on clean installs