Merge "Minor fixes"