Fixed errors with metadata