Tweak more error messages