baseModel fixes