Fix doc and NAMESPACE issues