fixing issues with metadata