small namespace fixes