#34 - Fix all Sonare issues: further issues fixed