Fixed some issues introduced with the Metadata class