Minor fixes and more namespacing...