Fix global namespace pollution