Design review fixes