Fix violations reported by QS Tools