Fix miscellaneous errors.