Fixes to QSTools Violations