Minor UCP fixes