Tweaks for UCP