Some small design fixes