Fixed save metadata issues