Web Audit fixes

Merged Michael Fairchild requested to merge webaudit-fixes into master

Merge request reports