Design review tweaks