Minor changes in the global namespace registering