Small tweaks to the error output