NAMESPACE issues fixed