Fixes on models