More metadata fixes.