Found a few more namespace issues