Various updates to UC