More tweaks for model components