Merge "Minor fixes."