Importer fix

Some fixes for Reimporter / YamlLoader.