Any design fixes