More tweaks based on usage.