Improved some errors.