Fixed dependencies and models.