Bug fix and metadata upgrade