SONARTFS-1 Fix some quality flaws