Fixed some issues with YAMLDataSource and YAMLHelper