Fixed namespaces and build error