Merge "Fix minor issues." into udc-dev