Updated/fixed dependencies
Fixed some dependency errors