Fixing namespace issues