Fixed a few dependency issues