A few design fixes