Fixes instanceof errors, and "null" reporter labels.