Fixed a torrent of dependency issues