Cleanup namespaces post merge

Fixing a few things that were causing compile errors.