Fix models and db