Fix namespacing issues - doh