fixed some namespace issues