Unit setting tweaks