Tweaks related to model count