Fix namespace issues