Tweaks on Sabayon detection #2