Build back better (compilation part 2)