Code Quality: fixed more Sonar violations and turned some warnings off (no functionality change)