Fix some issues, because of models change