More design fixes in preparation for AI threads