Release cleanup

Cleaning up some bugs in preparation for a release
Fixes required namespacing issues