Bug fixing namespaces and such