Some fixes for namespace and preping for UDP dev.