more metadata fixes