Various fixups

Merged Nigel Kukard requested to merge nkukard/awit-backstep-traceback:multivolume into master

Merge request reports