namespace-related fixes