Fixed namespace issues