Fixing namespacing /library issues.