A flurry of design fixes