Minor report-edit.
Merged parallell changes.
Minor edit.