More minor design tweaks.