adjustments for DUB build