Feature design fixes