Build structure fixes