source structure fixes