Fixed some more dependencies