Fixed a next bunch of errors.