mher: Minor changes.