Quick tweaks to win some time