Fixed a couple metadata bugs