Fixed some namespace issues.