Fixed a couple of namespace issues.