Minor tweaks to spread load evenly