A couple of small design fixes