minor fixes to account for renamed namespaces