some fixes on models