Some more minor design tweaks