Fix inconsistent linenr & id reporting