Wrap up some more errors.