Fix Enstore-reading Sonarcloud issues