Removed namespacing for now (FIXME). And fixed environment setting