Fixed broken/split build