Cleaned up some errors.