fixup! Minor design fixes