Finishing report fixes