Big design fixes in proto