Improved some errors