Further minor design tweaks