Sonar changes are back

[P. Ottlinger]

Hi,

I seem to have restored most of the changes concerning the Sonar
integration - feel free to fix any more warnings/issues :-)

Thanks
Phil