Tiny tweaks around error messages