Migration code changes, plus profling;