Small tweaks to error messages