Fix namespace issues.