More namespaced function calls fixes.