Tweaks on Sabayon detection #1