design review fixes