fixes for namespace changes