fixes some small namespace issues