Fix moving of old metadata