A suite of minor design fixes