Fixed a lot of dependencies