Various design fixes