Fixes some import errors in models.