Very small design fixes