Bug fix and upgrade metadata