Fix some namespacing stuff and dumping