Merge "Fix heap corruption and verification."