Big fixes for YamlDataStore

Just a couple of things I missed.