Merge "Minor fixes on documentation."