Fixes to QSTools Violations

This fixes all the QSTools violations that can be done in a semi-automatic fashion.