Minor tweaks for Unite - using no-split flag