Attempt to fix global namespace.