Bugfix: update reporting code to match arg changes