Initial OOB fixes.

Removed custom namespacing.