Metadata and checksum related fixes