Fixing bugs with namespace.