Operations design fixes