FRIENDSIC-3951 Sonar warnings