More metadata fixes