More changes to error messages