Fixed some namespace issues