minor fixes to (our own) error messages