a couple more design fixes