Metadata extractor, various minor fixes