Little design fixes