Tweaks for cdv-core build