Fixes for refactored  models;