More tweaks to handles