Fixing namespacing issues.