Fixed a typo and finished the conversion.