Small design fixes