Adapt builds