Minor tweaks.
A few more tweaks.