Fix namespacing issues