Some namespace fixes`