Improve metainfo handling.