Minor improvements in metadata