resolve some namespace issues