Fix recreation issues.