Fix some namespace issues