Adjustments to error messages