Dataset migration fixes