few minor fixes for metadata mapping