Fix namespaces issues