Fixes more issues caused by Namespacing + closes #317