Metadata and water fix