Fixes namespace issues