Fix spec & yaml