Fixed dependency errors

Probably a faulty merge from 2.4