Fixed multi-map build