Namespace cleanup and missing stuff