Fix: several namespace issues