Fixed a few remaining errors.