YAML fixes

This fixes some bugs introduced in #85.