Fix some namespacing bugs.