Tweaks for Unite