Fixed further dependencies errors