Some small design improvements