Fixed global namespace issues