Fixing namespaces issues.