More minor design fixes