Minor tweaks to improve the perceived performance.