System structure fixes