Fixed couple namespace issues