Bagreport fixes #part2