Yaml handling and specs fixes