Minor design tweaks.