Fixing type and metadata.