SLDSS-9780 - Fixing sonar-related issues