Fix for namespacing issues