More fixes for sector building and architecture merging