Improve error msgs and prefixes.