fix some namespace issues ;)