[fix] additional SONAR fixes