Fixed most of the remaining QSTools violations