Fixing namespace and debug code.