Couple base instances left
Namespace fixes