I wrote a post about migration problems, I think if you stick with the process described there you should be able to resolve the issues: