More dependency fixing.