Design review fixes from Shay.