Merge "Minor updates"