Namespace and doc fixes