#4 fixes for metadata create