Fix global namespace issues