Final report fixes