Namespaces config change, small bugs